Merge lp:~marcustomlinson/indicator-power/lp-1227250 into lp:indicator-power/13.10

Proposed by Marcus Tomlinson
Status: Merged
Approved by: Charles Kerr
Approved revision: 208
Merged at revision: 208
Proposed branch: lp:~marcustomlinson/indicator-power/lp-1227250
Merge into: lp:indicator-power/13.10
Diff against target: 12 lines (+3/-0)
1 file modified
src/service.c (+3/-0)
To merge this branch: bzr merge lp:~marcustomlinson/indicator-power/lp-1227250
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Charles Kerr (community) Approve
Review via email:

Commit message

Added torch icons to either end of brightness slider.

To post a comment you must log in.
Charles Kerr (charlesk) wrote :

Confirmed WFM on phablet

review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.

review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/service.c'
2--- src/service.c 2013-10-04 14:36:34 +0000
3+++ src/service.c 2013-10-10 14:39:19 +0000
4@@ -463,6 +463,9 @@
5 g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.unity.slider");
6 g_menu_item_set_attribute (item, "min-value", "d", brightness_to_percentage (self, lo));
7 g_menu_item_set_attribute (item, "max-value", "d", brightness_to_percentage (self, hi));
8+ g_menu_item_set_attribute (item, "min-icon", "s", "torch-off" );
9+ g_menu_item_set_attribute (item, "max-icon", "s", "torch-on" );
11 return item;
12 }


People subscribed via source and target branches