Merge lp:~ted/indicator-session/restart-icon-change into lp:indicator-session/0.1

Proposed by Ted Gould
Status: Merged
Approved by: Neil J. Patel
Approved revision: 218
Merged at revision: 219
Proposed branch: lp:~ted/indicator-session/restart-icon-change
Merge into: lp:indicator-session/0.1
Diff against target: 17 lines (+2/-2)
1 file modified
src/indicator-session.c (+2/-2)
To merge this branch: bzr merge lp:~ted/indicator-session/restart-icon-change
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+77090@code.launchpad.net

Description of the change

Fixes the icon to update instead of replacing. This probably caused an
interesting race in the panel service making the panel service think it was
hidden in some cases. Depends on when it updated.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

the fix seems to work fine for me

Revision history for this message
Neil J. Patel (njpatel) wrote :

HAHA

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/indicator-session.c'
--- src/indicator-session.c 2011-09-08 17:40:07 +0000
+++ src/indicator-session.c 2011-09-27 04:37:23 +0000
@@ -509,11 +509,11 @@
509 }509 }
510 else if (g_strcmp0(signal_name, "RestartRequired") == 0) { 510 else if (g_strcmp0(signal_name, "RestartRequired") == 0) {
511 if (greeter_mode == TRUE){511 if (greeter_mode == TRUE){
512 self->devices.image = indicator_image_helper (GREETER_ICON_RESTART);512 indicator_image_helper_update(self->devices.image, GREETER_ICON_RESTART);
513 }513 }
514 else{514 else{
515 g_debug ("reboot required");515 g_debug ("reboot required");
516 self->devices.image = indicator_image_helper (ICON_RESTART); 516 indicator_image_helper_update(self->devices.image, ICON_RESTART);
517 }517 }
518 } 518 }
519}519}

Subscribers

People subscribed via source and target branches