gnome-screensaver r1457 - in trunk: . src

[mccann svn gnome org]

Author: mccann
Date: Sat Jun  7 16:54:57 2008
New Revision: 1457
URL: http://svn.gnome.org/viewvc/gnome-screensaver?rev=1457&view=rev

Log:
2008-06-07  William Jon McCann  <jmccann redhat com>

	* src/gs-listener-dbus.c (gs_listener_acquire):
	Don't require system bus connection.



Modified:
   trunk/ChangeLog
   trunk/src/gs-listener-dbus.c

Modified: trunk/src/gs-listener-dbus.c
==============================================================================
--- trunk/src/gs-listener-dbus.c	(original)
+++ trunk/src/gs-listener-dbus.c	Sat Jun  7 16:54:57 2008
@@ -1973,28 +1973,33 @@
                             ",member='NameOwnerChanged'",
                             NULL);
 
-        dbus_connection_add_filter (listener->priv->system_connection, listener_dbus_system_filter_function, listener, NULL);
-
-        dbus_bus_add_match (listener->priv->system_connection,
-                            "type='signal'"
-                            ",interface='"HAL_DEVICE_INTERFACE"'"
-                            ",member='Condition'",
-                            NULL);
-        dbus_bus_add_match (listener->priv->system_connection,
-                            "type='signal'"
-                            ",interface='"CK_SESSION_INTERFACE"'"
-                            ",member='Unlock'",
-                            NULL);
-        dbus_bus_add_match (listener->priv->system_connection,
-                            "type='signal'"
-                            ",interface='"CK_SESSION_INTERFACE"'"
-                            ",member='Lock'",
-                            NULL);
-        dbus_bus_add_match (listener->priv->system_connection,
-                            "type='signal'"
-                            ",interface='"CK_SESSION_INTERFACE"'"
-                            ",member='ActiveChanged'",
-                            NULL);
+        if (listener->priv->system_connection != NULL) {
+                dbus_connection_add_filter (listener->priv->system_connection,
+                                            listener_dbus_system_filter_function,
+                                            listener,
+                                            NULL);
+
+                dbus_bus_add_match (listener->priv->system_connection,
+                                    "type='signal'"
+                                    ",interface='"HAL_DEVICE_INTERFACE"'"
+                                    ",member='Condition'",
+                                    NULL);
+                dbus_bus_add_match (listener->priv->system_connection,
+                                    "type='signal'"
+                                    ",interface='"CK_SESSION_INTERFACE"'"
+                                    ",member='Unlock'",
+                                    NULL);
+                dbus_bus_add_match (listener->priv->system_connection,
+                                    "type='signal'"
+                                    ",interface='"CK_SESSION_INTERFACE"'"
+                                    ",member='Lock'",
+                                    NULL);
+                dbus_bus_add_match (listener->priv->system_connection,
+                                    "type='signal'"
+                                    ",interface='"CK_SESSION_INTERFACE"'"
+                                    ",member='ActiveChanged'",
+                                    NULL);
+        }
 
         return acquired;
 }