Fixes a bug that prevents session locking if the session was unlocked after changing...

diff --cc src/seat.c
index 9a56baf26075af40b67db7ae7e7be05a96f8416a,1e813e8b14af712894611712cef6164c265837ec..b847332739fc78c7800060efe699b649ef72c779
--- 1/src/seat.c
--- 2/src/seat.c
+++ b/src/seat.c
@@@ -269,6 -269,57 +269,54 @@@ seat_get_next_session (Seat *seat
      return seat->priv->next_session;
  }
  
 -    {
+ /**
+  * Obtains the active session which lightdm expects to be active.
+  *
+  * This function is different from seat_get_active_session() in that the
+  * later (in the case of xlocal seats) dynamically finds the session that is
+  * really active (based on the active VT), whereas this function returns the
+  * session that lightdm activated last by itself, which may not be the actual
+  * active session (i.e. VT changes).
+  */
+ Session *
+ seat_get_expected_active_session (Seat *seat)
+ {
+     g_return_val_if_fail (seat != NULL, NULL);
+     return seat->priv->active_session;
+ }
+ 
+ /**
+  * Sets the active session which lightdm expects to be active.
+  *
+  * This function is different from seat_set_active_session() in that the
+  * later performs an actual session activation, whereas this function just
+  * updates the active session after the session has been activated by some
+  * means external to lightdm (i.e. VT changes).
+  */
+ void
+ seat_set_externally_activated_session (Seat *seat, Session *session)
+ {
+     g_return_if_fail (seat != NULL);
+     if (seat->priv->active_session)
 -    }
+         g_object_unref (seat->priv->active_session);
 -
+     seat->priv->active_session = g_object_ref (session);
+ }
+ 
+ Session *
+ seat_find_session_by_login1_id (Seat *seat, const gchar *login1_session_id)
+ {
+     GList *session_link;
++
+     for (session_link = seat->priv->sessions; session_link; session_link = session_link->next)
+     {
+         Session *session = session_link->data;
 -        {
+         if (g_strcmp0 (login1_session_id, session_get_login1_session_id (session)) == 0)
 -        }
+             return session;
+     }
++
+     return NULL;
+ }
+ 
  gboolean
  seat_get_can_switch (Seat *seat)
  {

diff --cc tests/src/test-runner.c
Simple merge