From b34dc27b7b191e56cbf640a963435d6e68982608 Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Tue, 2 Oct 2012 20:05:07 +0200 Subject: migrate to gsettings --- data/Makefile.am | 28 ++------- data/mate-session.schemas.in.in | 101 -------------------------------- data/org.mate.session.gschema.xml.in.in | 47 +++++++++++++++ 3 files changed, 52 insertions(+), 124 deletions(-) delete mode 100644 data/mate-session.schemas.in.in create mode 100644 data/org.mate.session.gschema.xml.in.in (limited to 'data') 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 @@ - - - - - - /schemas/apps/mate-session/options/auto_save_session - /apps/mate-session/options/auto_save_session - mate - bool - false - - Save sessions - If enabled, mate-session will save the session automatically. - - - - /schemas/apps/mate-session/options/logout_prompt - /apps/mate-session/options/logout_prompt - mate - bool - true - - Logout prompt - If enabled, mate-session will prompt the user before ending a session. - - - - /schemas/desktop/mate/session/idle_delay - /desktop/mate/session/idle_delay - mate - int - 5 - - Time before session is considered idle - - The number of minutes of inactivity before the session is - considered idle. - - - - - /schemas/desktop/mate/session/default_session - /desktop/mate/session/default_session - mate - list - string - [mate-settings-daemon] - - - Default session - List of applications that are part of the default session. - - - - /schemas/desktop/mate/session/required_components_list - /desktop/mate/session/required_components_list - mate - list - string - [windowmanager,panel,filemanager] - - Required session components - 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. - - - - /schemas/desktop/mate/session/required_components/windowmanager - /desktop/mate/session/required_components/windowmanager - mate - string - @DEFAULT_WM@ - - Window Manager - The window manager is the program that draws the title bar and borders around windows, and allows you to move and resize windows. - - - - /schemas/desktop/mate/session/required_components/panel - /desktop/mate/session/required_components/panel - mate - string - mate-panel - - Panel - The panel provides the bar at the top or bottom of the screen containing menus, the window list, status icons, the clock, etc. - - - - /schemas/desktop/mate/session/required_components/filemanager - /desktop/mate/session/required_components/filemanager - mate - string - caja - - File Manager - The file manager provides the desktop icons and allows you to interact with your saved files. - - - - - 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 @@ + + + + false + <_summary>Save sessions + <_description>If enabled, mate-session will save the session automatically. + + + true + <_summary>Logout prompt + <_description>If enabled, mate-session will prompt the user before ending a session. + + + 5 + <_summary>Time before session is considered idle + <_description>The number of minutes of inactivity before the session is considered idle. + + + [ 'mate-settings-daemon' ] + <_summary>Default session + <_description>List of applications that are part of the default session. + + + [ 'windowmanager', 'panel', 'filemanager' ] + <_summary>Required session components + <_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. + + + + + + '@DEFAULT_WM@' + <_summary>Window Manager + <_description>The window manager is the program that draws the title bar and borders around windows, and allows you to move and resize windows. + + + 'mate-panel' + <_summary>Panel + <_description>The panel provides the bar at the top or bottom of the screen containing menus, the window list, status icons, the clock, etc. + + + 'caja' + <_summary>File Manager + <_description>The file manager provides the desktop icons and allows you to interact with your saved files. + + + -- cgit v1.2.1