gnome-session r5163 - in trunk: . gnome-session

[halfline svn gnome org]

Author: halfline
Date: Mon Dec  8 17:59:59 2008
New Revision: 5163
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5163&view=rev

Log:
2008-12-08  Ray Strode  <rstrode redhat com>

	* gnome-session/gsm-dbus-client.c
	(client_dbus_filter_function):
	Add patch from Tim Kosse to address
	issue with multiple clients trying
	to use the QueryEndSession dbus api
	(bug 559469)


Modified:
   trunk/ChangeLog
   trunk/gnome-session/gsm-dbus-client.c

Modified: trunk/gnome-session/gsm-dbus-client.c
==============================================================================
--- trunk/gnome-session/gsm-dbus-client.c	(original)
+++ trunk/gnome-session/gsm-dbus-client.c	Mon Dec  8 17:59:59 2008
@@ -218,6 +218,12 @@
                  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);
+
+                if (path != NULL && strcmp (path, gsm_client_peek_id (GSM_CLIENT (client))) != 0) {
+                        /* Different object path */
+                        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+                }
                 handle_end_session_response (client, message);
                 return DBUS_HANDLER_RESULT_HANDLED;
         }