Session Menu

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

  1. lp-1674389-fix-suspend-on-u8
  2. Merge into trunk.16.10
Proposed by Charles Kerr
Status: Merged
Approved by: dobey
Approved revision: 489
Merged at revision: 490
Proposed branch: lp:~charlesk/indicator-session/lp-1674389-fix-suspend-on-u8
Merge into: lp:indicator-session
Diff against target: 39 lines (+4/-4)
1 file modified
src/backend-dbus/actions.c (+4/-4)
To merge this branch: bzr merge lp:~charlesk/indicator-session/lp-1674389-fix-suspend-on-u8
Reviewer Review Type Date Requested Status
dobey (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+320574@code.launchpad.net

Commit message

Handle "challenge" responses from login1 CanSuspend and CanHibernate calls

Description of the change

Handle "challenge" responses from login1 CanSuspend and CanHibernate calls

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

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)
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
228 {228 {
229 priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(gself)->priv;229 priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(gself)->priv;
230230
231 const gboolean b = !g_strcmp0 (str, "yes");231 const gboolean b = !g_strcmp0 (str, "yes") || !g_strcmp0 (str, "challenge");
232232
233 if (p->can_suspend != b)233 if (p->can_suspend != b)
234 {234 {
@@ -255,7 +255,7 @@
255 {255 {
256 priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(gself)->priv;256 priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(gself)->priv;
257257
258 const gboolean b = !g_strcmp0 (str, "yes");258 const gboolean b = !g_strcmp0 (str, "yes") || !g_strcmp0 (str, "challenge");
259259
260 if (p->can_hibernate != b)260 if (p->can_hibernate != b)
261 {261 {
@@ -454,7 +454,7 @@
454 g_return_if_fail (p->login1_manager != NULL);454 g_return_if_fail (p->login1_manager != NULL);
455455
456 login1_manager_call_suspend (p->login1_manager,456 login1_manager_call_suspend (p->login1_manager,
457 FALSE,457 TRUE,
458 p->login1_manager_cancellable,458 p->login1_manager_cancellable,
459 NULL,459 NULL,
460 NULL);460 NULL);
@@ -468,7 +468,7 @@
468 g_return_if_fail (p->login1_manager != NULL);468 g_return_if_fail (p->login1_manager != NULL);
469469
470 login1_manager_call_hibernate (p->login1_manager,470 login1_manager_call_hibernate (p->login1_manager,
471 FALSE,471 TRUE,
472 p->login1_manager_cancellable,472 p->login1_manager_cancellable,
473 NULL,473 NULL,
474 NULL);474 NULL);

Subscribers

People subscribed via source and target branches