mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-08 11:28:01 +02:00
2006-01-27 Iain Holmes <iain@openedhand.com>
* glib/dbus-gproxy.c (dbus_g_proxy_dispose): Protect the dispose method from being called multiple times.
This commit is contained in:
parent
25799b8197
commit
6a48e47424
2 changed files with 10 additions and 0 deletions
|
|
@ -1,3 +1,8 @@
|
||||||
|
2006-01-27 Iain Holmes <iain@openedhand.com>
|
||||||
|
|
||||||
|
* glib/dbus-gproxy.c (dbus_g_proxy_dispose): Protect the dispose
|
||||||
|
method from being called multiple times.
|
||||||
|
|
||||||
2006-01-19 Robert McQueen <robot101@debian.org>
|
2006-01-19 Robert McQueen <robot101@debian.org>
|
||||||
|
|
||||||
* glib/dbus-binding-tool-glib.c: Patch from Rob Taylor
|
* glib/dbus-binding-tool-glib.c: Patch from Rob Taylor
|
||||||
|
|
|
||||||
|
|
@ -1395,10 +1395,15 @@ dbus_g_proxy_dispose (GObject *object)
|
||||||
DBusGProxy *proxy = DBUS_G_PROXY (object);
|
DBusGProxy *proxy = DBUS_G_PROXY (object);
|
||||||
DBusGProxyPrivate *priv = DBUS_G_PROXY_GET_PRIVATE(proxy);
|
DBusGProxyPrivate *priv = DBUS_G_PROXY_GET_PRIVATE(proxy);
|
||||||
|
|
||||||
|
if (priv->pending_calls == NULL)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/* Cancel outgoing pending calls */
|
/* Cancel outgoing pending calls */
|
||||||
g_hash_table_foreach (priv->pending_calls, cancel_pending_call, proxy);
|
g_hash_table_foreach (priv->pending_calls, cancel_pending_call, proxy);
|
||||||
g_hash_table_destroy (priv->pending_calls);
|
g_hash_table_destroy (priv->pending_calls);
|
||||||
|
priv->pending_calls = NULL;
|
||||||
|
|
||||||
if (priv->manager && proxy != priv->manager->bus_proxy)
|
if (priv->manager && proxy != priv->manager->bus_proxy)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue