Refactored code to add seat_find_session_by_login1_id() for better SOLID practice...

[sojka/lightdm.git] / src / session.c

diff --git a/src/session.c b/src/session.c
index 10e369c30c704953b54e826d2a6b727b51831e91..2797982bb29662267dcfb54832c161a794e987fb 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -100,7 +100,7 @@ struct SessionPrivate
     gchar *console_kit_cookie;
 
     /* login1 session */
-    gchar *login1_session;
+    gchar *login1_session_id;
 
     /* Environment to set in child */
     GList *env;
@@ -653,10 +653,10 @@ session_get_username (Session *session)
 }
 
 const gchar *
-session_get_login1_session (Session *session)
+session_get_login1_session_id (Session *session)
 {
     g_return_val_if_fail (session != NULL, NULL);
-    return session->priv->login1_session;
+    return session->priv->login1_session_id;
 }
 
 const gchar *
@@ -812,7 +812,7 @@ session_real_run (Session *session)
     for (i = 0; i < argc; i++)
         write_string (session, session->priv->argv[i]);
 
-    session->priv->login1_session = read_string_from_child (session);
+    session->priv->login1_session_id = read_string_from_child (session);
     session->priv->console_kit_cookie = read_string_from_child (session);
 }
 
@@ -822,8 +822,8 @@ session_lock (Session *session)
     g_return_if_fail (session != NULL);
     if (getuid () == 0)
     {
-        if (session->priv->login1_session)
-            login1_service_lock_session (login1_service_get_instance (), session->priv->login1_session);
+        if (session->priv->login1_session_id)
+            login1_service_lock_session (login1_service_get_instance (), session->priv->login1_session_id);
         else if (session->priv->console_kit_cookie)
             ck_lock_session (session->priv->console_kit_cookie);
     }
@@ -835,8 +835,8 @@ session_unlock (Session *session)
     g_return_if_fail (session != NULL);
     if (getuid () == 0)
     {
-        if (session->priv->login1_session)
-            login1_service_unlock_session (login1_service_get_instance (), session->priv->login1_session);
+        if (session->priv->login1_session_id)
+            login1_service_unlock_session (login1_service_get_instance (), session->priv->login1_session_id);
         else if (session->priv->console_kit_cookie)
             ck_unlock_session (session->priv->console_kit_cookie);
     }
@@ -848,8 +848,8 @@ session_activate (Session *session)
     g_return_if_fail (session != NULL);
     if (getuid () == 0)
     {
-        if (session->priv->login1_session)
-            login1_service_activate_session (login1_service_get_instance (), session->priv->login1_session);
+        if (session->priv->login1_session_id)
+            login1_service_activate_session (login1_service_get_instance (), session->priv->login1_session_id);
         else if (session->priv->console_kit_cookie)
             ck_activate_session (session->priv->console_kit_cookie);
     }
@@ -944,7 +944,7 @@ session_finalize (GObject *object)
     if (self->priv->x_authority)
         g_object_unref (self->priv->x_authority);
     g_free (self->priv->remote_host_name);
-    g_free (self->priv->login1_session);
+    g_free (self->priv->login1_session_id);
     g_free (self->priv->console_kit_cookie);
     g_list_free_full (self->priv->env, g_free);
     g_strfreev (self->priv->argv);