[maemo-commits] [maemo-commits] r19566 - in projects/haf/trunk/gconf2: . gconf

[From: subversion at stage.maemo.org]

Author: albanc
Date: 2009-12-10 16:57:28 +0200 (Thu, 10 Dec 2009)
New Revision: 19566

Modified:
   projects/haf/trunk/gconf2/ChangeLog
   projects/haf/trunk/gconf2/gconf/gconf-dbus.c
Log:
Bug #132751: optimize libgconf D-Bus match rules

Modified: projects/haf/trunk/gconf2/ChangeLog
===================================================================
--- projects/haf/trunk/gconf2/ChangeLog	2009-12-10 09:21:28 UTC (rev 19565)
+++ projects/haf/trunk/gconf2/ChangeLog	2009-12-10 14:57:28 UTC (rev 19566)
@@ -1,3 +1,8 @@
+2009-12-10  Alban Crequy  <alban.crequy at collabora.co.uk>
+
+	* gconf/gconf-dbus.c:
+	Optimize libgconf D-Bus match rules
+
 2009-07-23  Richard Hult  <richard at imendio.com>
 
 	* backends/markup-backend.c: Remove unused 5 minute timeout.

Modified: projects/haf/trunk/gconf2/gconf/gconf-dbus.c
===================================================================
--- projects/haf/trunk/gconf2/gconf/gconf-dbus.c	2009-12-10 09:21:28 UTC (rev 19565)
+++ projects/haf/trunk/gconf2/gconf/gconf-dbus.c	2009-12-10 14:57:28 UTC (rev 19566)
@@ -43,11 +43,9 @@
 #define d(x) 
 
 #define DAEMON_NAME_OWNER_CHANGED_RULE \
-    "type='signal',member='NameOwnerChanged',arg0='org.gnome.GConf'"
+    "type='signal',interface='"DBUS_INTERFACE_DBUS"',member='NameOwnerChanged',arg0='org.gnome.GConf'"
 #define NOTIFY_RULE \
     "type='method_call',interface='org.gnome.GConf.Database',member='Notify'"
-#define DAEMON_DISCONNECTED_RULE \
-    "type='signal',member='Disconnected'"
 
 struct _GConfEngine {
   guint refcount;
@@ -422,7 +420,6 @@
 
   dbus_bus_add_match (global_conn, DAEMON_NAME_OWNER_CHANGED_RULE, NULL);
   dbus_bus_add_match (global_conn, NOTIFY_RULE, NULL);
-  dbus_bus_add_match (global_conn, DAEMON_DISCONNECTED_RULE, NULL);
 
   dbus_connection_add_filter (global_conn, gconf_dbus_message_filter,
 			      NULL, NULL);