Merge lp:~charlesk/indicator-session/lp-1674389-fix-suspend-on-u8 into lp:indicator-session

[Charles Kerr]

Handle "challenge" responses from login1 CanSuspend and CanHibernate calls

Handle "challenge" responses from login1 CanSuspend and CanHibernate calls

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:489
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-session-ci/16/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1852
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1859
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1635
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1635/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1635
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1635/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1635
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1635/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1635
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1635/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1635
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1635/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1635
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1635/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-session-ci/16/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'src/backend-dbus/actions.c'
--- src/backend-dbus/actions.c	2016-04-08 20:49:07 +0000
+++ src/backend-dbus/actions.c	2017-03-22 02:36:10 +0000
@@ -228,7 +228,7 @@
     {
       priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(gself)->priv;
 
-      const gboolean b = !g_strcmp0 (str, "yes");
+      const gboolean b = !g_strcmp0 (str, "yes") || !g_strcmp0 (str, "challenge");
 
       if (p->can_suspend != b)
         {
@@ -255,7 +255,7 @@
     {
       priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(gself)->priv;
 
-      const gboolean b = !g_strcmp0 (str, "yes");
+      const gboolean b = !g_strcmp0 (str, "yes") || !g_strcmp0 (str, "challenge");
 
       if (p->can_hibernate != b)
         {
@@ -454,7 +454,7 @@
   g_return_if_fail (p->login1_manager != NULL);
 
   login1_manager_call_suspend (p->login1_manager,
-                               FALSE,
+                               TRUE,
                                p->login1_manager_cancellable,
                                NULL,
                                NULL);
@@ -468,7 +468,7 @@
   g_return_if_fail (p->login1_manager != NULL);
 
   login1_manager_call_hibernate (p->login1_manager,
-                                 FALSE,
+                                 TRUE,
                                  p->login1_manager_cancellable,
                                  NULL,
                                  NULL);