patches/gnome-session-11-null-dbus-path.diff
author yippi
Thu, 31 May 2012 20:16:52 +0000
changeset 22481 1ff6784d9b6f
parent 15330 a935e2c278b2
permissions -rw-r--r--
2012-05-31 Brian Cameron <[email protected]> * base-specs/shared-mime-info.spec: Bump to 1.0. * base-specs/nautilus.spec, base-specs/pulseaudio.spec, base-specs/gnome-settings-daemon.spec, specs/SUNWdconf.spec: Add patch comments. * base-specs/gnome-panel.spec: Add --disable-telepathy-glib so it does not build with this module we do not deliver.

diff -urN gnome-session-2.25.90/gnome-session/gsm-dbus-client.c ../SUNWgnome-session-2.25.2.hacked/gnome-session-2.25.90/gnome-session/gsm-dbus-client.c
--- gnome-session-2.25.90/gnome-session/gsm-dbus-client.c	2009-02-03 13:32:47.000000000 +0000
+++ ../SUNWgnome-session-2.25.2.hacked/gnome-session-2.25.90/gnome-session/gsm-dbus-client.c	2009-02-12 14:26:43.874980000 +0000
@@ -212,10 +212,11 @@
 
         path = dbus_message_get_path (message);
 
-        g_debug ("GsmDBusClient: obj_path=%s interface=%s method=%s",
-                 dbus_message_get_path (message),
-                 dbus_message_get_interface (message),
-                 dbus_message_get_member (message));
+	if (path != NULL)
+        	g_debug ("GsmDBusClient: obj_path=%s interface=%s method=%s",
+                 	 dbus_message_get_path (message),
+                 	 dbus_message_get_interface (message),
+                 	 dbus_message_get_member (message));
 
         if (dbus_message_is_method_call (message, SM_DBUS_CLIENT_PRIVATE_INTERFACE, "EndSessionResponse")) {
                 g_assert (gsm_client_peek_id (GSM_CLIENT (client)) != NULL);