aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-08-19 14:32:20 -0500
committerTed Gould <ted@gould.cx>2011-08-19 14:32:20 -0500
commit20b7a5e043b0c751791e775cb96094b53e38cb6f (patch)
tree3e5fdea51c35ab6a751a6fd5f9baacb771bd0372
parent28389054bde478136f1337577f7bce3d65b03433 (diff)
downloadayatana-indicator-session-20b7a5e043b0c751791e775cb96094b53e38cb6f.tar.gz
ayatana-indicator-session-20b7a5e043b0c751791e775cb96094b53e38cb6f.tar.bz2
ayatana-indicator-session-20b7a5e043b0c751791e775cb96094b53e38cb6f.zip
Setting up convert script and completing the GSettings transition including translations
-rw-r--r--data/Makefile.am13
-rw-r--r--data/com.canonical.indicator.session.gschema.xml24
-rw-r--r--data/com.canonical.indicator.session.gschema.xml.in24
-rw-r--r--data/indicator-session.convert6
-rw-r--r--data/indicator-session.schemas.in50
5 files changed, 41 insertions, 76 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 2a9ea62..27328fb 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,12 +10,21 @@ dbus_services_DATA = $(service_in_files:.service.in=.service)
sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
@INTLTOOL_SCHEMAS_RULE@
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
+gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml
+
+convertdir = $(datadir)/GConf/gsettings
+dist_convert_DATA = indicator-session.convert
+
EXTRA_DIST = \
$(service_in_files) \
- $(schema_in_files)
+ $(gsettings_SCHEMAS:.xml=.xml.in)
+
CLEANFILES = \
$(dbus_services_DATA) \
- $(schema_DATA)
+ $(gsettings_SCHEMAS)
diff --git a/data/com.canonical.indicator.session.gschema.xml b/data/com.canonical.indicator.session.gschema.xml
deleted file mode 100644
index ba09583..0000000
--- a/data/com.canonical.indicator.session.gschema.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<schemalist>
- <schema id="com.canonical.indicator.session" path="/apps/indicator-session/">
- <key name="suppress-logout-restart-shutdown" type="b">
- <default>false</default>
- <summary>Suppress the dialog to confirm logout, restart and shutdown action</summary>
- <description>Whether or not to show confirmation dialogs for logout, restart and shutdown actions.</description>
- </key>
- <key name="suppress-logout-menuitem" type="b">
- <default>false</default>
- <summary>Remove the Log Out item from the session menu</summary>
- <description>Makes it so that the logout button doesn't show in the session menu.</description>
- </key>
- <key name="suppress-restart-menuitem" type="b">
- <default>false</default>
- <summary>Remove the Restart item from the session menu</summary>
- <description>Makes it so that the restart button doesn't show in the session menu.</description>
- </key>
- <key name="suppress-shutdown-menuitem" type="b">
- <default>false</default>
- <summary>Remove the shutdown item from the session menu</summary>
- <description>Makes it so that the shutdown button doesn't show in the session menu.</description>
- </key>
- </schema>
-</schemalist>
diff --git a/data/com.canonical.indicator.session.gschema.xml.in b/data/com.canonical.indicator.session.gschema.xml.in
new file mode 100644
index 0000000..0cb6815
--- /dev/null
+++ b/data/com.canonical.indicator.session.gschema.xml.in
@@ -0,0 +1,24 @@
+<schemalist>
+ <schema id="com.canonical.indicator.session" path="/apps/indicator-session/">
+ <key name="suppress-logout-restart-shutdown" type="b">
+ <default>false</default>
+ <_summary>Suppress the dialog to confirm logout, restart and shutdown action</_summary>
+ <_description>Whether or not to show confirmation dialogs for logout, restart and shutdown actions.</_description>
+ </key>
+ <key name="suppress-logout-menuitem" type="b">
+ <default>false</default>
+ <_summary>Remove the Log Out item from the session menu</_summary>
+ <_description>Makes it so that the logout button doesn't show in the session menu.</_description>
+ </key>
+ <key name="suppress-restart-menuitem" type="b">
+ <default>false</default>
+ <_summary>Remove the Restart item from the session menu</_summary>
+ <_description>Makes it so that the restart button doesn't show in the session menu.</_description>
+ </key>
+ <key name="suppress-shutdown-menuitem" type="b">
+ <default>false</default>
+ <_summary>Remove the shutdown item from the session menu</_summary>
+ <_description>Makes it so that the shutdown button doesn't show in the session menu.</_description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/data/indicator-session.convert b/data/indicator-session.convert
new file mode 100644
index 0000000..92775d8
--- /dev/null
+++ b/data/indicator-session.convert
@@ -0,0 +1,6 @@
+[com.canonical.indicator.session]
+panel_user_name = /system/indicator/me/display
+suppress_logout_restart_shutdown = /apps/indicator-session/suppress_logout_restart_shutdown
+suppress_logout_menuitem = /apps/indicator-session/suppress_logout_menuitem
+suppress_restart_menuitem = /apps/indicator-session/suppress_restart_menuitem
+suppress_shutdown_menuitem = /apps/indicator-session/suppress_shutdown_menuitem
diff --git a/data/indicator-session.schemas.in b/data/indicator-session.schemas.in
deleted file mode 100644
index f4e70da..0000000
--- a/data/indicator-session.schemas.in
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
- <schemalist>
- <schema>
- <key>/schemas/apps/indicator-session/suppress_logout_restart_shutdown</key>
- <applyto>/apps/indicator-session/suppress_logout_restart_shutdown</applyto>
- <owner>indicator-session</owner>
- <type>bool</type>
- <default>FALSE</default>
- <locale name="C">
- <short>Suppress the dialog to confirm logout, restart and shutdown action</short>
- <long>Whether or not to show confirmation dialogs for logout,
- restart and shutdown actions.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/indicator-session/suppress_logout_menuitem</key>
- <applyto>/apps/indicator-session/suppress_logout_menuitem</applyto>
- <owner>indicator-session</owner>
- <type>bool</type>
- <default>FALSE</default>
- <locale name="C">
- <short>Remove the Log Out item from the session menu</short>
- <long>Makes it so that the logout button doesn't show in the session menu.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/indicator-session/suppress_restart_menuitem</key>
- <applyto>/apps/indicator-session/suppress_restart_menuitem</applyto>
- <owner>indicator-session</owner>
- <type>bool</type>
- <default>FALSE</default>
- <locale name="C">
- <short>Remove the Restart item from the session menu</short>
- <long>Makes it so that the restart button doesn't show in the session menu.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/indicator-session/suppress_shutdown_menuitem</key>
- <applyto>/apps/indicator-session/suppress_shutdown_menuitem</applyto>
- <owner>indicator-session</owner>
- <type>bool</type>
- <default>FALSE</default>
- <locale name="C">
- <short>Remove the shutdown item from the session menu</short>
- <long>Makes it so that the shutdown button doesn't show in the session menu.</long>
- </locale>
- </schema>
- </schemalist>
-</gconfschemafile>