migrate to gsettingsmate-session-manager-1.5.0

author: Stefano Karapetsas <[email protected]> 2012-10-02 20:05:07 +0200
committer: Stefano Karapetsas <[email protected]> 2012-10-02 20:05:07 +0200
commit: b34dc27b7b191e56cbf640a963435d6e68982608 (patch)
tree: a655b07b606bb3de16c1f9be0fba1d14e46cacb6 /data
parent: d564dd5d1416dde95fea79eef1a994bd3d1c7d3f (diff)
download: mate-session-manager-b34dc27b7b191e56cbf640a963435d6e68982608.tar.bz2
mate-session-manager-b34dc27b7b191e56cbf640a963435d6e68982608.tar.xz
3 files changed, 52 insertions, 124 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index c68a309..2cd9a8a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -21,41 +21,23 @@ endif
 
 @INTLTOOL_DESKTOP_RULE@
 
-schemas_in_in_files = mate-session.schemas.in.in
-schemas_in_files = $(schemas_in_in_files:.schemas.in.in=.schemas.in)
-schemasdir = $(MATECONF_SCHEMA_FILE_DIR)
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-
-$(schemas_in_files): $(schemas_in_files).in Makefile
+org.mate.session.gschema.xml.in: org.mate.session.gschema.xml.in.in Makefile
 $(AM_V_GEN)sed \
 -e "s|\@DEFAULT_WM\@|$(DEFAULT_WM)|" \
 $< > $@
 
-@INTLTOOL_SCHEMAS_RULE@
-
-if MATECONF_SCHEMAS_INSTALL
-install-data-local:
- if test -z "$(DESTDIR)" ; then \
- for p in $(schemas_DATA) ; do \
- MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
- done \
- fi
-uninstall-local:
- for p in $(schema_DATA) ; do \
- MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-uninstall-rule $(top_builddir)/data/$$p ; \
- done
-endif
+gsettings_SCHEMAS = org.mate.session.gschema.xml
+@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
 
 EXTRA_DIST = \
 mate-wm \
 $(xsession_in_files) \
- $(schemas_in_in_files) \
+ $(gsettings_SCHEMAS) \
 $(ui_DATA) \
 $(pixmap_DATA_dist)
 
 CLEANFILES = \
- $(schemas_in_files) \
- $(schemas_DATA) \
 $(xsession_DATA) \
 $(desktop_DATA) \
 mate-wm.desktop
diff --git a/data/mate-session.schemas.in.in b/data/mate-session.schemas.in.in
deleted file mode 100644
index c049cf0..0000000
--- a/data/mate-session.schemas.in.in
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-<mateconfschemafile>
- <schemalist>
-
- <schema>
- <key>/schemas/apps/mate-session/options/auto_save_session</key>
- <applyto>/apps/mate-session/options/auto_save_session</applyto>
- <owner>mate</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Save sessions</short>
- <long>If enabled, mate-session will save the session automatically.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mate-session/options/logout_prompt</key>
- <applyto>/apps/mate-session/options/logout_prompt</applyto>
- <owner>mate</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>Logout prompt</short>
- <long>If enabled, mate-session will prompt the user before ending a session.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/mate/session/idle_delay</key>
- <applyto>/desktop/mate/session/idle_delay</applyto>
- <owner>mate</owner>
- <type>int</type>
- <default>5</default>
- <locale name="C">
- <short>Time before session is considered idle</short>
- <long>
- The number of minutes of inactivity before the session is
- considered idle.
- </long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/mate/session/default_session</key>
- <applyto>/desktop/mate/session/default_session</applyto>
- <owner>mate</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[mate-settings-daemon]</default>
- <!-- FIXME when not string frozen: mention that required components are added to the default session -->
- <locale name="C">
- <short>Default session</short>
- <long>List of applications that are part of the default session.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/mate/session/required_components_list</key>
- <applyto>/desktop/mate/session/required_components_list</applyto>
- <owner>mate</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[windowmanager,panel,filemanager]</default>
- <locale name="C">
- <short>Required session components</short>
- <long>List of components that are required as part of the session. (Each element names a key under "/desktop/mate/session/required_components"). The Startup Applications preferences tool will not normally allow users to remove a required component from the session, and the session manager will automatically add the required components back to the session at login time if they do get removed.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/mate/session/required_components/windowmanager</key>
- <applyto>/desktop/mate/session/required_components/windowmanager</applyto>
- <owner>mate</owner>
- <type>string</type>
- <default>@DEFAULT_WM@</default>
- <locale name="C">
- <short>Window Manager</short>
- <long>The window manager is the program that draws the title bar and borders around windows, and allows you to move and resize windows.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/mate/session/required_components/panel</key>
- <applyto>/desktop/mate/session/required_components/panel</applyto>
- <owner>mate</owner>
- <type>string</type>
- <default>mate-panel</default>
- <locale name="C">
- <short>Panel</short>
- <long>The panel provides the bar at the top or bottom of the screen containing menus, the window list, status icons, the clock, etc.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/mate/session/required_components/filemanager</key>
- <applyto>/desktop/mate/session/required_components/filemanager</applyto>
- <owner>mate</owner>
- <type>string</type>
- <default>caja</default>
- <locale name="C">
- <short>File Manager</short>
- <long>The file manager provides the desktop icons and allows you to interact with your saved files.</long>
- </locale>
- </schema>
-
- </schemalist>
-</mateconfschemafile>
diff --git a/data/org.mate.session.gschema.xml.in.in b/data/org.mate.session.gschema.xml.in.in
new file mode 100644
index 0000000..2b0f5f1
--- /dev/null
+++ b/data/org.mate.session.gschema.xml.in.in
@@ -0,0 +1,47 @@
+<schemalist>
+ <schema id="org.mate.session" path="/desktop/mate/session/">
+ <key name="auto-save-session" type="b">
+ <default>false</default>
+ <_summary>Save sessions</_summary>
+ <_description>If enabled, mate-session will save the session automatically.</_description>
+ </key>
+ <key name="logout-prompt" type="b">
+ <default>true</default>
+ <_summary>Logout prompt</_summary>
+ <_description>If enabled, mate-session will prompt the user before ending a session.</_description>
+ </key>
+ <key name="idle-delay" type="i">
+ <default>5</default>
+ <_summary>Time before session is considered idle</_summary>
+ <_description>The number of minutes of inactivity before the session is considered idle.</_description>
+ </key>
+ <key name="default-session" type="as">
+ <default>[ 'mate-settings-daemon' ]</default>
+ <_summary>Default session</_summary>
+ <_description>List of applications that are part of the default session.</_description>
+ </key>
+ <key name="required-components-list" type="as">
+ <default>[ 'windowmanager', 'panel', 'filemanager' ]</default>
+ <_summary>Required session components</_summary>
+ <_description>List of components that are required as part of the session. (Each element names a key under "/desktop/mate/session/required_components"). The Startup Applications preferences tool will not normally allow users to remove a required component from the session, and the session manager will automatically add the required components back to the session at login time if they do get removed.</_description>
+ </key>
+ <child name="required-components" schema="org.mate.session.required-components"/>
+ </schema>
+ <schema id="org.mate.session.required-components" path="/desktop/mate/session/required-components/">
+ <key name="windowmanager" type="s">
+ <default>'@DEFAULT_WM@'</default>
+ <_summary>Window Manager</_summary>
+ <_description>The window manager is the program that draws the title bar and borders around windows, and allows you to move and resize windows.</_description>
+ </key>
+ <key name="panel" type="s">
+ <default>'mate-panel'</default>
+ <_summary>Panel</_summary>
+ <_description>The panel provides the bar at the top or bottom of the screen containing menus, the window list, status icons, the clock, etc.</_description>
+ </key>
+ <key name="filemanager" type="s">
+ <default>'caja'</default>
+ <_summary>File Manager</_summary>
+ <_description>The file manager provides the desktop icons and allows you to interact with your saved files.</_description>
+ </key>
+ </schema>
+</schemalist>
author	Stefano Karapetsas <[email protected]>	2012-10-02 20:05:07 +0200
committer	Stefano Karapetsas <[email protected]>	2012-10-02 20:05:07 +0200
commit	b34dc27b7b191e56cbf640a963435d6e68982608 (patch)
tree	a655b07b606bb3de16c1f9be0fba1d14e46cacb6 /data
parent	d564dd5d1416dde95fea79eef1a994bd3d1c7d3f (diff)
download	mate-session-manager-b34dc27b7b191e56cbf640a963435d6e68982608.tar.bz2 mate-session-manager-b34dc27b7b191e56cbf640a963435d6e68982608.tar.xz