From 1c9c7772c2d4f2cf3108d833b9a1fe2113fd33a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <javier.jardon@codethink.co.uk>
Date: Thu, 25 Aug 2011 18:46:15 +0100
Subject: Use consistent location for gsettings schema

Use the same location as indicator-datetime
---
 Makefile.am                                       | 4 ++--
 data/com.canonical.indicator.power.gschema.xml.in | 9 +++++++++
 data/org.ubuntu.indicator-power.gschema.xml.in    | 9 ---------
 src/indicator-power.c                             | 2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 data/com.canonical.indicator.power.gschema.xml.in
 delete mode 100644 data/org.ubuntu.indicator-power.gschema.xml.in

diff --git a/Makefile.am b/Makefile.am
index 8b57590..0d4d34b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = po
 
-gsettings_in_file = data/org.ubuntu.indicator-power.gschema.xml.in
+gsettings_in_file = data/com.canonical.indicator.power.gschema.xml.in
 gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
 
 @INTLTOOL_XML_NOMERGE_RULE@
@@ -35,7 +35,7 @@ dist_noinst_SCRIPTS = \
 	autogen.sh
 
 dist_noinst_DATA = \
-	data/org.ubuntu.indicator-power.gschema.xml \
+	data/com.canonical.indicator.power.gschema.xml \
 	$(gsettings_in_file)
 
 CLEANFILES = \
diff --git a/data/com.canonical.indicator.power.gschema.xml.in b/data/com.canonical.indicator.power.gschema.xml.in
new file mode 100644
index 0000000..bf4368f
--- /dev/null
+++ b/data/com.canonical.indicator.power.gschema.xml.in
@@ -0,0 +1,9 @@
+<schemalist>
+  <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>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.ubuntu.indicator-power.gschema.xml.in b/data/org.ubuntu.indicator-power.gschema.xml.in
deleted file mode 100644
index ff6c807..0000000
--- a/data/org.ubuntu.indicator-power.gschema.xml.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.ubuntu.indicator-power" path="/org/ubuntu/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>
-    </key>
-  </schema>
-</schemalist>
diff --git a/src/indicator-power.c b/src/indicator-power.c
index 3be04be..cf30051 100644
--- a/src/indicator-power.c
+++ b/src/indicator-power.c
@@ -769,7 +769,7 @@ indicator_power_init (IndicatorPower *self)
                             self);
 
   /* GSettings */
-  priv->settings = g_settings_new ("org.ubuntu.indicator-power");
+  priv->settings = g_settings_new ("com.canonical.indicator.power");
 }
 
 static void
-- 
cgit v1.2.3