Unity

Merge lp:~3v1n0/unity/ups-unset-idle-on-removal into lp:unity

  1. ups-unset-idle-on-removal
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 4033
Proposed branch: lp:~3v1n0/unity/ups-unset-idle-on-removal
Merge into: lp:unity
Diff against target: 11 lines (+1/-0)
1 file modified
services/panel-service.c (+1/-0)
To merge this branch: bzr merge lp:~3v1n0/unity/ups-unset-idle-on-removal
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Andrea Azzarone (community) Approve
Review via email: mp+275361@code.launchpad.net

Commit message

PanelService: unset the idle ID before removal on callback

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:4009
http://jenkins.qa.ubuntu.com/job/unity-ci/1321/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/97
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/97/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1321/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'services/panel-service.c'
2--- services/panel-service.c 2015-10-16 08:46:13 +0000
3+++ services/panel-service.c 2015-10-22 15:01:05 +0000
4@@ -1314,6 +1314,7 @@
5
6 g_slist_free (self->priv->removed_entries);
7 self->priv->removed_entries = NULL;
8+ self->priv->remove_idle = 0;
9
10 return G_SOURCE_REMOVE;
11 }