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

[Marcus Tomlinson]

Added torch icons to either end of brightness slider.

[Charles Kerr (charlesk)]

Confirmed WFM on phablet

review: Approve

[PS Jenkins bot (ps-jenkins)]

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.
https://code.launchpad.net/~marcustomlinson/indicator-power/lp-1227250/+merge/190382/+edit-commit-message

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/service.c'
--- src/service.c	2013-10-04 14:36:34 +0000
+++ src/service.c	2013-10-10 14:39:19 +0000
@@ -463,6 +463,9 @@
   g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.unity.slider");
   g_menu_item_set_attribute (item, "min-value", "d", brightness_to_percentage (self, lo));
   g_menu_item_set_attribute (item, "max-value", "d", brightness_to_percentage (self, hi));
+  g_menu_item_set_attribute (item, "min-icon", "s", "torch-off" );
+  g_menu_item_set_attribute (item, "max-icon", "s", "torch-on" );
+
   return item;
 }