gnome-session r4873 - in branches/dbus_based: . gnome-session

[mccann svn gnome org]

Author: mccann
Date: Tue Jul 29 14:59:38 2008
New Revision: 4873
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4873&view=rev

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

	* gnome-session/gsm-manager.c (gsm_manager_register_client):
	* gnome-session/gsm-manager.xml:
	* gnome-session/test-client-dbus.c (register_client):
	Don't return the "new" startup ID from the register
	client method.  We can make this available via
	the Client interface if necessary.



Modified:
   branches/dbus_based/ChangeLog
   branches/dbus_based/gnome-session/gsm-manager.c
   branches/dbus_based/gnome-session/gsm-manager.xml
   branches/dbus_based/gnome-session/test-client-dbus.c

Modified: branches/dbus_based/gnome-session/gsm-manager.c
==============================================================================
--- branches/dbus_based/gnome-session/gsm-manager.c	(original)
+++ branches/dbus_based/gnome-session/gsm-manager.c	Tue Jul 29 14:59:38 2008
@@ -2554,9 +2554,10 @@
         gsm_client_set_status (client, GSM_CLIENT_REGISTERED);
 
         g_assert (new_startup_id != NULL);
-        dbus_g_method_return (context, new_startup_id, gsm_client_get_id (client));
         g_free (new_startup_id);
 
+        dbus_g_method_return (context, gsm_client_get_id (client));
+
         return TRUE;
 }
 

Modified: branches/dbus_based/gnome-session/gsm-manager.xml
==============================================================================
--- branches/dbus_based/gnome-session/gsm-manager.xml	(original)
+++ branches/dbus_based/gnome-session/gsm-manager.xml	Tue Jul 29 14:59:38 2008
@@ -55,11 +55,6 @@
           <doc:summary>Client startup identifier</doc:summary>
         </doc:doc>
       </arg>
-      <arg type="s" name="new_client_startup_id" direction="out">
-        <doc:doc>
-          <doc:summary>New client startup identifier</doc:summary>
-        </doc:doc>
-      </arg>
       <arg type="o" name="client_id" direction="out">
         <doc:doc>
           <doc:summary>The object path of the newly registered client</doc:summary>

Modified: branches/dbus_based/gnome-session/test-client-dbus.c
==============================================================================
--- branches/dbus_based/gnome-session/test-client-dbus.c	(original)
+++ branches/dbus_based/gnome-session/test-client-dbus.c	Tue Jul 29 14:59:38 2008
@@ -37,7 +37,6 @@
 
 static DBusGConnection *bus_connection = NULL;
 static DBusGProxy      *sm_proxy = NULL;
-static char            *new_startup_id = NULL;
 static char            *client_id = NULL;
 static DBusGProxy      *client_proxy = NULL;
 static GMainLoop       *main_loop = NULL;
@@ -109,7 +108,6 @@
                                  G_TYPE_STRING, app_id,
                                  G_TYPE_STRING, startup_id,
                                  G_TYPE_INVALID,
-                                 G_TYPE_STRING, &new_startup_id,
                                  G_TYPE_STRING, &client_id,
                                  G_TYPE_INVALID);
         if (! res) {