diff -u consolekit-0.3.0/debian/changelog consolekit-0.3.0/debian/changelog --- consolekit-0.3.0/debian/changelog +++ consolekit-0.3.0/debian/changelog @@ -1,3 +1,20 @@ +consolekit (0.3.0-2ubuntu4) jaunty; urgency=low + + * debian/patches/04-consolekit_park.patch: + - When a session is removed parking is enabled, and then the active + seat is possibly changed. The intention is that parking is only + enabled if the active seat is changed in response to the session removal. + However, there are codepaths where the active seat is not changed, + but the enable flag isn't removed, meaning that the next time the + active session changes it may inadvertently park. Forcing the enable + flag to FALSE after possibly updating the active session when removing + a session ensures that parking will only occur in response to a session + removal, and not VT switches. + - In other words, make VT switching away from X not take two attempts + sometimes and fix LP: #271962. + + -- James Westby Tue, 21 Apr 2009 14:58:49 +0100 + consolekit (0.3.0-2ubuntu3) jaunty; urgency=low * Add 13-work-without-policykit.patch: If PolicyKit cannot be initialized, diff -u consolekit-0.3.0/debian/patches/04-consolekit_park.patch consolekit-0.3.0/debian/patches/04-consolekit_park.patch --- consolekit-0.3.0/debian/patches/04-consolekit_park.patch +++ consolekit-0.3.0/debian/patches/04-consolekit_park.patch @@ -142,12 +142,14 @@ gboolean ck_seat_remove_session (CkSeat *seat, CkSession *session, -@@ -592,6 +629,7 @@ +@@ -592,6 +629,9 @@ g_signal_emit (seat, signals [SESSION_REMOVED], 0, ssid); /* try to change the active session */ + seat->priv->vt_park_enable = TRUE; maybe_update_active_session (seat); ++ /* we should no longer park, whether we did then or not */ ++ seat->priv->vt_park_enable = FALSE; if (orig_session != NULL) { @@ -988,6 +1026,8 @@