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

[From: subversion at stage.maemo.org]

Author: richard
Date: 2008-10-28 10:33:45 +0200 (Tue, 28 Oct 2008)
New Revision: 16506

Modified:
   projects/haf/trunk/gconf2/ChangeLog
   projects/haf/trunk/gconf2/gconf/gconf-dbus.c
Log:
Use right match rule


Modified: projects/haf/trunk/gconf2/ChangeLog
===================================================================
--- projects/haf/trunk/gconf2/ChangeLog	2008-10-27 18:12:03 UTC (rev 16505)
+++ projects/haf/trunk/gconf2/ChangeLog	2008-10-28 08:33:45 UTC (rev 16506)
@@ -1,3 +1,9 @@
+2008-10-28  Richard Hult  <richard at imendio.com>
+
+	* gconf/gconf-dbus.c: Patch from Ross Burton to use right the
+	match rule, fixes problems when using D-Bus 1.1.x. Backported from
+	upstream GConf D-Bus.
+
 2008-07-18  Guillem Jover  <guillem.jover at nokia.com>
 
 	* configure.in (dbus_systemservice_dir): Add new argument.

Modified: projects/haf/trunk/gconf2/gconf/gconf-dbus.c
===================================================================
--- projects/haf/trunk/gconf2/gconf/gconf-dbus.c	2008-10-27 18:12:03 UTC (rev 16505)
+++ projects/haf/trunk/gconf2/gconf/gconf-dbus.c	2008-10-28 08:33:45 UTC (rev 16506)
@@ -45,7 +45,7 @@
 #define DAEMON_NAME_OWNER_CHANGED_RULE \
     "type='signal',member='NameOwnerChanged',arg0='org.gnome.GConf'"
 #define NOTIFY_RULE \
-    "type='method_call',interface='org.gnome.GConf.Database'"
+    "type='method_call',interface='org.gnome.GConf.Database',member='Notify'"
 #define DAEMON_DISCONNECTED_RULE \
     "type='signal',member='Disconnected'"