Fix switch to guest test case

diff --git a/src/seat.c b/src/seat.c
index 0b2dfd9f9392b3794c4194dc3b8440097eae492a..e8405b84a47f186a6a47047235d0a78d1ff7ba5c 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -37,9 +37,6 @@ struct SeatPrivate
     /* TRUE if display server can be shared for sessions */
     gboolean share_display_server;
 
-    /* Name of guest account */
-    gchar *guest_username;
-
     /* The display servers on this seat */
     GList *display_servers;
 
@@ -196,7 +193,7 @@ seat_get_can_switch (Seat *seat)
 gboolean
 seat_get_allow_guest (Seat *seat)
 {
-    g_return_val_if_fail (seat != NULL, FALSE);  
+    g_return_val_if_fail (seat != NULL, FALSE);
     return seat_get_boolean_property (seat, "allow-guest") && guest_account_is_installed ();
 }
 
@@ -425,12 +422,6 @@ session_stopped_cb (Session *session, Seat *seat)
             run_script (seat, display_server, script, session_get_user (session));
     }
 
-    if (seat->priv->guest_username && strcmp (session_get_username (session), seat->priv->guest_username) == 0)
-    {
-        g_free (seat->priv->guest_username);
-        seat->priv->guest_username = NULL;
-    }
-
     g_signal_handlers_disconnect_matched (session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, seat);
     seat->priv->sessions = g_list_remove (seat->priv->sessions, session);
 
@@ -922,11 +913,28 @@ seat_switch_to_user (Seat *seat, const gchar *username, const gchar *session_nam
     return FALSE;
 }
 
+static Session *
+find_guest_session (Seat *seat)
+{
+    GList *link;
+
+    for (link = seat->priv->sessions; link; link = link->next)
+    {
+        Session *session = link->data;
+      
+        if (session_get_is_guest (session))
+            return session;
+    }
+
+    return NULL;
+}
+
 gboolean
 seat_switch_to_guest (Seat *seat, const gchar *session_name)
 {
     Session *session;
     DisplayServer *display_server;
+    GList *link;
 
     g_return_val_if_fail (seat != NULL, FALSE);
 
@@ -934,10 +942,12 @@ seat_switch_to_guest (Seat *seat, const gchar *session_name)
         return FALSE;
 
     /* Switch to session if one open */
-    if (seat->priv->guest_username)
+    session = find_guest_session (seat);
+    if (session)
     {
-        g_debug ("Switching to existing guest account %s", seat->priv->guest_username);
-        return switch_to_user (seat, seat->priv->guest_username, FALSE);
+        g_debug ("Switching to existing guest account %s", session_get_username (session));
+        seat_set_active_session (seat, session);
+        return TRUE;
     }
 
     display_server = create_display_server (seat);
@@ -1135,7 +1145,6 @@ seat_finalize (GObject *object)
     self = SEAT (object);
 
     g_hash_table_unref (self->priv->properties);
-    g_free (self->priv->guest_username);
     for (link = self->priv->display_servers; link; link = link->next)
     {
         DisplayServer *display_server = link->data;

diff --git a/src/session.c b/src/session.c
index d2b03cc418d7024184c0e70dea29cd7e0ff862a5..39faf6c9f04b3de718b5cb7ba996643c77f7226b 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -156,6 +156,13 @@ session_set_is_guest (Session *session, gboolean is_guest)
     session->priv->is_guest = is_guest;
 }
 
+gboolean
+session_get_is_guest (Session *session)
+{
+    g_return_val_if_fail (session != NULL, FALSE);
+    return session->priv->is_guest;
+}
+
 void
 session_set_log_file (Session *session, const gchar *filename)
 {