Merge lp:~bluesabre/xubuntu-default-settings/hide-xfpm-label into lp:xubuntu-default-settings

[Sean Davis]

On the current wily daily build, the xfce4-power-manager panel plugin displays remaining charge time by default. This change explicitly forces the plugin to not display the panel by default.

[Simon Steinbeiß (ochosi)]

This only affects the power-manager >=1.5.x and if I remember correctly we don't ship this yet in 15.10 (should still be in -staging).

Personally I prefer seeing the percentage, but I also don't mind hiding it.
(Sidenote: I guess for xfpm1.6.0 I want to make this option a bit more accessible...)

[Pasi Lallinaho (knome)]

As long as it is available from the tooltip, I think this is a good change.

[Sean Davis (bluesabre)]

Rolling this in now that we are moving forward with Xfce Power Manager 1.6.x

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-11 00:29:43 +0000
+++ debian/changelog	2015-09-01 02:46:12 +0000
@@ -1,3 +1,10 @@
+xubuntu-default-settings (15.10.3) UNRELEASED; urgency=medium
+
+  * etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml:
+    - Add show-panel-label=0 to hide battery charge time label
+
+ -- Sean Davis <[e-mail]>  Mon, 31 Aug 2015 22:39:08 -0400
+
 xubuntu-default-settings (15.10.2) wily; urgency=medium
 
   [ Robert Ancell ]

=== modified file 'etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml'
--- etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml	2014-09-01 01:51:29 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml	2015-09-01 02:46:12 +0000
@@ -11,5 +11,6 @@
     <property name="dpms-on-ac-off" type="uint" value="60"/>
     <property name="dpms-on-battery-sleep" type="uint" value="15"/>
     <property name="dpms-on-battery-off" type="uint" value="30"/>
+    <property name="show-panel-label" type="int" value="0"/>
   </property>
 </channel>