From 54d0bd428fb93559f34c298ff4926102bcd98467 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Fri, 19 Aug 2011 12:20:08 +0100 Subject: converted the old gconf schema to gsettings --- data/com.canonical.indicator.session.gschema.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 data/com.canonical.indicator.session.gschema.xml (limited to 'data') diff --git a/data/com.canonical.indicator.session.gschema.xml b/data/com.canonical.indicator.session.gschema.xml new file mode 100644 index 0000000..ba09583 --- /dev/null +++ b/data/com.canonical.indicator.session.gschema.xml @@ -0,0 +1,24 @@ + + + + false + Suppress the dialog to confirm logout, restart and shutdown action + Whether or not to show confirmation dialogs for logout, restart and shutdown actions. + + + false + Remove the Log Out item from the session menu + Makes it so that the logout button doesn't show in the session menu. + + + false + Remove the Restart item from the session menu + Makes it so that the restart button doesn't show in the session menu. + + + false + Remove the shutdown item from the session menu + Makes it so that the shutdown button doesn't show in the session menu. + + + -- cgit v1.2.3 From 2fe4c360b2eb616cb43472b8e8e7b69bdefd349d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Aug 2011 11:08:30 -0500 Subject: Dropping gconf from build --- data/Makefile.am | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 1f522d7..2a9ea62 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -9,25 +9,8 @@ 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@ - -#$(dbus_services_DATA): $(service_in_files) Makefile -# sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - EXTRA_DIST = \ $(service_in_files) \ $(schema_in_files) @@ -36,10 +19,3 @@ 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 -- cgit v1.2.3 From 20b7a5e043b0c751791e775cb96094b53e38cb6f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Aug 2011 14:32:20 -0500 Subject: Setting up convert script and completing the GSettings transition including translations --- data/Makefile.am | 13 +++++- data/com.canonical.indicator.session.gschema.xml | 24 ----------- .../com.canonical.indicator.session.gschema.xml.in | 24 +++++++++++ data/indicator-session.convert | 6 +++ data/indicator-session.schemas.in | 50 ---------------------- 5 files changed, 41 insertions(+), 76 deletions(-) delete mode 100644 data/com.canonical.indicator.session.gschema.xml create mode 100644 data/com.canonical.indicator.session.gschema.xml.in create mode 100644 data/indicator-session.convert delete mode 100644 data/indicator-session.schemas.in (limited to 'data') 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 @@ - - - - false - Suppress the dialog to confirm logout, restart and shutdown action - Whether or not to show confirmation dialogs for logout, restart and shutdown actions. - - - false - Remove the Log Out item from the session menu - Makes it so that the logout button doesn't show in the session menu. - - - false - Remove the Restart item from the session menu - Makes it so that the restart button doesn't show in the session menu. - - - false - Remove the shutdown item from the session menu - Makes it so that the shutdown button doesn't show in the session menu. - - - 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 @@ + + + + false + <_summary>Suppress the dialog to confirm logout, restart and shutdown action + <_description>Whether or not to show confirmation dialogs for logout, restart and shutdown actions. + + + false + <_summary>Remove the Log Out item from the session menu + <_description>Makes it so that the logout button doesn't show in the session menu. + + + false + <_summary>Remove the Restart item from the session menu + <_description>Makes it so that the restart button doesn't show in the session menu. + + + false + <_summary>Remove the shutdown item from the session menu + <_description>Makes it so that the shutdown button doesn't show in the session menu. + + + 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 @@ - - - - - /schemas/apps/indicator-session/suppress_logout_restart_shutdown - /apps/indicator-session/suppress_logout_restart_shutdown - indicator-session - bool - FALSE - - Suppress the dialog to confirm logout, restart and shutdown action - Whether or not to show confirmation dialogs for logout, - restart and shutdown actions. - - - - /schemas/apps/indicator-session/suppress_logout_menuitem - /apps/indicator-session/suppress_logout_menuitem - indicator-session - bool - FALSE - - Remove the Log Out item from the session menu - Makes it so that the logout button doesn't show in the session menu. - - - - /schemas/apps/indicator-session/suppress_restart_menuitem - /apps/indicator-session/suppress_restart_menuitem - indicator-session - bool - FALSE - - Remove the Restart item from the session menu - Makes it so that the restart button doesn't show in the session menu. - - - - /schemas/apps/indicator-session/suppress_shutdown_menuitem - /apps/indicator-session/suppress_shutdown_menuitem - indicator-session - bool - FALSE - - Remove the shutdown item from the session menu - Makes it so that the shutdown button doesn't show in the session menu. - - - - -- cgit v1.2.3 From 36098537001011bffd6b74ccbf318b59c81d75e8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Aug 2011 14:35:39 -0500 Subject: Don't have that yet --- data/indicator-session.convert | 1 - 1 file changed, 1 deletion(-) (limited to 'data') diff --git a/data/indicator-session.convert b/data/indicator-session.convert index 92775d8..3a087a6 100644 --- a/data/indicator-session.convert +++ b/data/indicator-session.convert @@ -1,5 +1,4 @@ [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 -- cgit v1.2.3