hal/hald hald_dbus.c,1.27,1.28

[David Zeuthen]

Update of /cvs/hal/hal/hald
In directory gabe:/tmp/cvs-serv20580/hald

Modified Files:
	hald_dbus.c 
Log Message:
2005-02-25  David Zeuthen  <davidz at redhat.com>

	* hald/hald_dbus.c (hald_dbus_filter_function): Patch from Ray Strode
	<rstrode at redhat.com> to catch up with D-BUS changes



Index: hald_dbus.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald_dbus.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- hald_dbus.c	23 Feb 2005 18:25:43 -0000	1.27
+++ hald_dbus.c	25 Feb 2005 16:55:23 -0000	1.28
@@ -2197,16 +2197,16 @@
 {
 
 	if (dbus_message_is_signal (message,
-				    DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+				    DBUS_INTERFACE_DBUS,
 				    "Disconnected") &&
 	    strcmp (dbus_message_get_path (message),
-		    DBUS_PATH_ORG_FREEDESKTOP_LOCAL) == 0) {
+		    DBUS_PATH_LOCAL) == 0) {
 
 		dbus_connection_unref (dbus_connection);
 		g_timeout_add (3000, reinit_dbus, NULL);
 
 	} else if (dbus_message_is_signal (message,
-					   DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+					   DBUS_INTERFACE_DBUS,
 					   "NameLost")) {
 
 		if (services_with_locks != NULL)
@@ -2368,8 +2368,8 @@
 
 	dbus_bus_add_match (dbus_connection,
 			    "type='signal',"
-			    "interface='"DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS"',"
-			    "sender='"DBUS_SERVICE_ORG_FREEDESKTOP_DBUS"',"
+			    "interface='"DBUS_INTERFACE_DBUS"',"
+			    "sender='"DBUS_SERVICE_DBUS"',"
 			    "member='NameLost'",
 			    NULL);