2005-04-13 Havoc Pennington <hp@redhat.com>

	* glib/dbus-gmain.c (message_queue_dispatch): only dispatch one
	message at a time to avoid monopolizing the main loop, bug
	#2953 from Benjamin Otte

diff --git a/ChangeLog b/ChangeLog
index 34b0e262acbaf8d5de30c13c900f368b371d411b..616560030cc2694d1519e15f03a6ce66ac35ec50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-13  Havoc Pennington  <hp@redhat.com>
+
+       * glib/dbus-gmain.c (message_queue_dispatch): only dispatch one
+       message at a time to avoid monopolizing the main loop, bug 
+       #2953 from Benjamin Otte
+
 2005-04-09  Havoc Pennington  <hp@redhat.com>
 
        * dbus/dbus-string.c (copy): change a memcpy to memmove due to

diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c
index 57be8490cc0e469163bee08ffe20a4a9ad3be966..1843f2247a0b0d739ea0de69a059d960e4546b26 100644 (file)
--- a/glib/dbus-gmain.c
+++ b/glib/dbus-gmain.c
@@ -103,9 +103,9 @@ message_queue_dispatch (GSource     *source,
   DBusConnection *connection = ((DBusGMessageQueue *)source)->connection;
 
   dbus_connection_ref (connection);
-  
-  while (dbus_connection_dispatch (connection) == DBUS_DISPATCH_DATA_REMAINS)
-    ;
+
+  /* Only dispatch once - we don't want to starve other GSource */
+  dbus_connection_dispatch (connection);
   
   dbus_connection_unref (connection);