Merge lp:~charlesk/indicator-session/lp-1205273 into lp:indicator-session/13.10

[Charles Kerr]

Lock the current session before switching to the guest session.

This is done by modifying IndicatorSessionActionsDbus::switch_to_guest() to call org.gnome.ScreenSaver's Lock function before switching to the guest session.

Lock the current session before switching to the guest session.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:408
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/93/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-amd64-ci/34
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-armhf-ci/31/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-session-ci/93/rebuild

review: Needs Fixing (continuous-integration)

[Ted Gould (ted)]

The code looks fine, but the failure seems to be in the test suite timing on ARM. Probably unrelated, but not top-approving to see if it should be fixed in this branch or another.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:409
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/94/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-armhf-ci/32

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-session-ci/94/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/indicator-session-autolanding/52/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1560
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-amd64-autolanding/10
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-armhf-autolanding/8/console

review: Needs Fixing (continuous-integration)

[Ted Gould (ted)]

Uhg, one more try.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/backend-dbus/actions.c'
--- src/backend-dbus/actions.c	2013-07-12 12:42:07 +0000
+++ src/backend-dbus/actions.c	2013-08-20 14:24:26 +0000
@@ -169,7 +169,7 @@
   if (p->dm_seat != NULL)
     {
       g_cancellable_cancel (p->dm_seat_cancellable);
-      g_clear_object (&p->dm_seat);
+      g_clear_object (&p->dm_seat_cancellable);
       g_clear_object (&p->dm_seat);
     }
 
@@ -734,7 +734,7 @@
 ***/
 
 static void
-my_switch_to_screensaver (IndicatorSessionActions * self)
+lock_current_session (IndicatorSessionActions * self)
 {
   priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(self)->priv;
 
@@ -744,6 +744,12 @@
 }
 
 static void
+my_switch_to_screensaver (IndicatorSessionActions * self)
+{
+  lock_current_session (self);
+}
+
+static void
 my_switch_to_greeter (IndicatorSessionActions * self)
 {
   priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(self)->priv;
@@ -762,6 +768,8 @@
 
   g_return_if_fail (p->dm_seat != NULL);
 
+  lock_current_session (self);
+
   display_manager_seat_call_switch_to_guest (p->dm_seat, "",
                                              p->dm_seat_cancellable,
                                              NULL, NULL);