aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <javier.jardon@codethink.co.uk>2011-08-25 18:46:15 +0100
committerJavier Jardón <javier.jardon@codethink.co.uk>2011-08-25 18:46:15 +0100
commit1c9c7772c2d4f2cf3108d833b9a1fe2113fd33a6 (patch)
tree368ef42b92b561514e3d513344f5948b8ca11856
parentbc4d8d425ada55b3bf707b9d65893cd53cdd81a1 (diff)
downloadayatana-indicator-power-1c9c7772c2d4f2cf3108d833b9a1fe2113fd33a6.tar.gz
ayatana-indicator-power-1c9c7772c2d4f2cf3108d833b9a1fe2113fd33a6.tar.bz2
ayatana-indicator-power-1c9c7772c2d4f2cf3108d833b9a1fe2113fd33a6.zip
Use consistent location for gsettings schema
Use the same location as indicator-datetime
-rw-r--r--Makefile.am4
-rw-r--r--data/com.canonical.indicator.power.gschema.xml.in (renamed from data/org.ubuntu.indicator-power.gschema.xml.in)2
-rw-r--r--src/indicator-power.c2
3 files changed, 4 insertions, 4 deletions
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/org.ubuntu.indicator-power.gschema.xml.in b/data/com.canonical.indicator.power.gschema.xml.in
index ff6c807..bf4368f 100644
--- a/data/org.ubuntu.indicator-power.gschema.xml.in
+++ b/data/com.canonical.indicator.power.gschema.xml.in
@@ -1,5 +1,5 @@
<schemalist>
- <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.ubuntu.indicator-power" path="/org/ubuntu/indicator-power/">
+ <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>
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