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

[mccann svn gnome org]

Author: mccann
Date: Wed Jun 18 20:45:19 2008
New Revision: 4761
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4761&view=rev

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

	* gnome-session/gsm-manager.c (bus_name_owner_changed),
	(on_xsmp_client_register_request), (gsm_manager_finalize):
	* gnome-session/gsm-manager.xml:
	Drop set_name.



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

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	Wed Jun 18 20:45:19 2008
@@ -76,7 +76,6 @@
         GHashTable             *apps_by_id;
 
         /* Current status */
-        char                   *name;
         GsmManagerPhase         phase;
         guint                   timeout_id;
         GSList                 *pending_apps;
@@ -492,7 +491,11 @@
                         GsmManager  *manager)
 {
         if (strlen (new_service_name) == 0) {
+                /* service removed */
                 remove_clients_for_connection (manager, old_service_name);
+        } else if (strlen (old_service_name) == 0) {
+                /* service added */
+                
         }
 }
 
@@ -675,7 +678,7 @@
 
         app = find_app_for_client_id (manager, new_id);
         if (app != NULL) {
-                gsm_client_set_app_id (client, gsm_app_get_id (app));
+                gsm_client_set_app_id (GSM_CLIENT (client), gsm_app_get_id (app));
                 gsm_app_registered (app);
                 goto out;
         }
@@ -1210,10 +1213,6 @@
                 g_object_unref (manager->priv->store);
         }
 
-        g_free (manager->priv->name);
-
-        /* FIXME */
-
         G_OBJECT_CLASS (gsm_manager_parent_class)->finalize (object);
 }
 
@@ -1544,32 +1543,6 @@
         return TRUE;
 }
 
-static void
-manager_set_name (GsmManager *manager,
-                  const char *name)
-{
-        g_free (manager->priv->name);
-        manager->priv->name = g_strdup (name);
-}
-
-gboolean
-gsm_manager_set_name (GsmManager *manager,
-                      const char *session_name,
-                      GError    **error)
-{
-        if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) {
-                g_set_error (error,
-                             GSM_MANAGER_ERROR,
-                             GSM_MANAGER_ERROR_NOT_IN_RUNNING,
-                             "SetName interface is only available during the Running phase");
-                return FALSE;
-        }
-
-        manager_set_name (manager, session_name);
-
-        return TRUE;
-}
-
 /* adapted from PolicyKit */
 static gboolean
 get_caller_info (GsmManager  *manager,

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	Wed Jun 18 20:45:19 2008
@@ -45,10 +45,6 @@
       <arg name="mode" type="i" direction="in"/>
     </method>
 
-    <method name="SetName">
-      <arg name="name" type="s" direction="in"/>
-    </method>
-
     <!-- Signals -->
 
     <signal name="SessionRunning">