diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 35 | ||||
| -rw-r--r-- | data/com.canonical.indicator.session.gschema.xml.in | 24 | ||||
| -rw-r--r-- | data/indicator-session.convert | 5 | ||||
| -rw-r--r-- | data/indicator-session.schemas.in | 50 |
4 files changed, 39 insertions, 75 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 1f522d7..27328fb 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -9,37 +9,22 @@ dbus_services_DATA = $(service_in_files:.service.in=.service) %.service: %.service.in sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -############################## -# GConf Schema -############################## - -schemadir = \ - $(GCONF_SCHEMA_FILE_DIR) - -schema_in_files = \ - indicator-session.schemas.in - -schema_DATA = \ - $(schema_in_files:.schemas.in=.schemas) - @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 -#$(dbus_services_DATA): $(service_in_files) Makefile -# sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ EXTRA_DIST = \ $(service_in_files) \ - $(schema_in_files) + $(gsettings_SCHEMAS:.xml=.xml.in) + CLEANFILES = \ $(dbus_services_DATA) \ - $(schema_DATA) - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - gconftool-2 --makefile-install-rule $(schema_DATA) -else -install-data-local: -endif + $(gsettings_SCHEMAS) + 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..3a087a6 --- /dev/null +++ b/data/indicator-session.convert @@ -0,0 +1,5 @@ +[com.canonical.indicator.session] +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> |