dbus/glib dbus-gproxy.c,1.44,1.45

[Robert McQueen]

Update of /cvs/dbus/dbus/glib
In directory gabe:/tmp/cvs-serv23972/glib

Modified Files:
	dbus-gproxy.c 
Log Message:
2006-01-27  Iain Holmes  <iain at openedhand.com>

	* glib/dbus-gproxy.c (dbus_g_proxy_dispose): Protect the dispose
	method from being called multiple times.

Index: dbus-gproxy.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gproxy.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- dbus-gproxy.c	5 Jan 2006 20:22:06 -0000	1.44
+++ dbus-gproxy.c	27 Jan 2006 15:06:55 -0000	1.45
@@ -1395,10 +1395,15 @@
   DBusGProxy *proxy = DBUS_G_PROXY (object);
   DBusGProxyPrivate *priv = DBUS_G_PROXY_GET_PRIVATE(proxy);
 
+  if (priv->pending_calls == NULL) 
+    {
+      return;
+    }
 
   /* Cancel outgoing pending calls */
   g_hash_table_foreach (priv->pending_calls, cancel_pending_call, proxy);
   g_hash_table_destroy (priv->pending_calls);
+  priv->pending_calls = NULL;
 
   if (priv->manager && proxy != priv->manager->bus_proxy)
     {