dbus/glib dbus-gmain.c,1.40,1.41

[John Palmieri]

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

Modified Files:
	dbus-gmain.c 
Log Message:
* glib/dbus-gmain.c (io_handler_dispatch): fix deadlock
  when using recursive g_main_loops

* python/_dbus.py (class Bus): add the ProxyObjectClass
  alias for ProxyObject to make it easier for the Twisted
  networking framework to integrate dbus.

* python/proxies.py (class ProxyObject): add the ProxyMethodClass
  alias for ProxyMethod to make it easier for the Twisted
  networking framework to integrate dbus.



Index: dbus-gmain.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gmain.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- dbus-gmain.c	19 Apr 2005 03:35:26 -0000	1.40
+++ dbus-gmain.c	16 May 2005 21:27:03 -0000	1.41
@@ -240,13 +240,7 @@
   handler = NULL;
 
   if (connection)
-    {
-      /* Dispatch messages */
-      while (dbus_connection_dispatch (connection) == DBUS_DISPATCH_DATA_REMAINS)
-        ;
-      
-      dbus_connection_unref (connection);
-    }
+    dbus_connection_unref (connection);
   
   return TRUE;
 }