[gdm/wip/wayland-for-merge: 10/17] manager: Rename the "user session" or "session" to the "seed session"

[Jasper St. Pierre <jstpierre src gnome org>]

commit 831fe40a9c53d635af5e69c46c2df7f156f81d9f
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Mar 6 15:39:25 2014 -0500

    manager: Rename the "user session" or "session" to the "seed session"
    
    A greeter environment always has two sessions: the greeter session, and
    the "user session".
    
    The "user session" tracks the login PAM conversation. PAM conversations
    need to be created without any user, so the name "user session" is a bit
    of a misnomer.
    
    The "user session" is created when the greeter is created, and exists
    when we're sitting at the username prompt. When the username is entered,
    we then start a session worker. When the verification conversation is
    finished, we then log the user in. The same exact GdmSession follows
    into the user session.
    
    Traditionally, the user session is started on the same X server as the
    greeter, so the GdmDisplay and GdmSlave all go with it. With the new
    display server management, we need to make the GdmSession follow into
    the user session created for the login, and then start a *new* user
    session for the next user that logs in on the same greeter.
    
    The name "seed session" tries to capture this. The GdmSession starts out
    as a little seed, and with a username and password, will one day blossom
    into a beautiful little user session which will one day live on its own,
    free from the greeter that gave it life and nourished it.
    
    It's the circle of life, and it moves us all.

 daemon/gdm-manager.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index 6ce693e..b4dc47d 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -102,9 +102,9 @@ static guint signals [LAST_SIGNAL] = { 0, };
 static void     gdm_manager_class_init  (GdmManagerClass *klass);
 static void     gdm_manager_init        (GdmManager      *manager);
 static void     gdm_manager_finalize    (GObject         *object);
-static void create_session_for_display (GdmManager *manager,
-                                        GdmDisplay *display,
-                                        uid_t       allowed_user);
+static void create_seed_session_for_display (GdmManager *manager,
+                                             GdmDisplay *display,
+                                             uid_t       allowed_user);
 
 static gpointer manager_object = NULL;
 
@@ -604,13 +604,13 @@ get_display_for_user_session (GdmSession *session)
 }
 
 static GdmSession *
-get_user_session_for_display (GdmDisplay *display)
+get_seed_session_for_display (GdmDisplay *display)
 {
         if (display == NULL) {
                 return NULL;
         }
 
-        return g_object_get_data (G_OBJECT (display), "gdm-session");
+        return g_object_get_data (G_OBJECT (display), "gdm-seed-session");
 }
 
 static gboolean
@@ -642,7 +642,7 @@ gdm_manager_handle_open_session (GdmDBusManager        *manager,
                 return TRUE;
         }
 
-        session = get_user_session_for_display (display);
+        session = get_seed_session_for_display (display);
 
         if (gdm_session_is_running (session)) {
                 error = g_error_new (G_DBUS_ERROR,
@@ -702,7 +702,7 @@ gdm_manager_handle_open_reauthentication_channel (GdmDBusManager        *manager
                 return TRUE;
         }
 
-        session = get_user_session_for_display (display);
+        session = get_seed_session_for_display (display);
 
         if (!gdm_session_is_running (session)) {
                 g_dbus_method_invocation_return_error_literal (invocation,
@@ -745,7 +745,7 @@ set_up_greeter_session (GdmManager *manager,
                 return;
         }
 
-        create_session_for_display (manager, display, passwd_entry->pw_uid);
+        create_seed_session_for_display (manager, display, passwd_entry->pw_uid);
         g_free (allowed_user);
 
         gdm_display_start_greeter_session (display);
@@ -1381,9 +1381,9 @@ touch_marker_file (GdmManager *manager)
 }
 
 static void
-create_session_for_display (GdmManager *manager,
-                            GdmDisplay *display,
-                            uid_t       allowed_user)
+create_seed_session_for_display (GdmManager *manager,
+                                 GdmDisplay *display,
+                                 uid_t       allowed_user)
 {
         GdmSession *session;
         gboolean    display_is_local = FALSE;
@@ -1463,7 +1463,7 @@ create_session_for_display (GdmManager *manager,
                           G_CALLBACK (on_user_session_died),
                           manager);
         g_object_set_data (G_OBJECT (session), "gdm-display", display);
-        g_object_set_data_full (G_OBJECT (display), "gdm-session", g_object_ref (session), (GDestroyNotify) 
g_object_unref);
+        g_object_set_data_full (G_OBJECT (display), "gdm-seed-session", g_object_ref (session), 
(GDestroyNotify) g_object_unref);
 
         start_autologin_conversation_if_necessary (manager, display, session);
         touch_marker_file (manager);