From 4b5ec3d0baaf4bb377ad1cb05a88e62408e14a28 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 1 Feb 2012 23:00:03 -0600
Subject: add support for icon-policy setting

---
 data/com.canonical.indicator.power.gschema.xml.in | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/com.canonical.indicator.power.gschema.xml.in b/data/com.canonical.indicator.power.gschema.xml.in
index bf4368f..3fb065f 100644
--- a/data/com.canonical.indicator.power.gschema.xml.in
+++ b/data/com.canonical.indicator.power.gschema.xml.in
@@ -1,9 +1,19 @@
 <schemalist>
+  <enum id="icon-policy-enum">
+    <value nick="present" value="0" />
+    <value nick="charge" value="1" />
+    <value nick="never" value="2" />
+  </enum>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.indicator.power" path="/com/canonical/indicator/power/">
     <key name="show-time" type="b">
       <default>false</default>
       <_summary>Show time in Menu Bar</_summary>
-      <_description>Whether show the time in the menu bar.</_description>
+      <_description>Whether or not to show the time in the menu bar.</_description>
+    </key>
+    <key enum="icon-policy-enum" name="icon-policy">
+      <default>"present"</default>
+      <_summary>When to show the battery status in the menu bar.</_summary>
+      <_description>Options for when to show battery status. Valid options are "present", "charge", and "never".</_description>
     </key>
   </schema>
 </schemalist>
-- 
cgit v1.2.3


From 612662f401ef931eea0d5e8c25319c4326cd2c2d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 14 Feb 2012 16:06:04 -0600
Subject: Make data have it's own makefile so the GSettings rules work properly
 on distcheck

---
 data/Makefile.am | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 data/Makefile.am

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..375c7ca
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,17 @@
+
+gsettings_in_file = com.canonical.indicator.power.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
+
+dist_noinst_DATA = \
+	com.canonical.indicator.power.gschema.xml \
+	$(gsettings_in_file)
+
+CLEANFILES = \
+	$(gsettings_SCHEMAS)
+
+MAINTAINERCLEANFILES = \
+	$(gsettings_SCHEMAS:.xml=.valid)
-- 
cgit v1.2.3