From b7013f0eb5567b2cfbc7b43be6b8ffddfc7d3a03 Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 8 Sep 2015 15:06:18 +0200 Subject: Rework gsettings schema building * Bump intltool required version for gsettings support * Extract strings with intltool directly * Let autoconf generate the xml files --- data/Makefile.am | 13 +++---- data/org.mate.session.gschema.xml.in | 63 +++++++++++++++++++++++++++++++++ data/org.mate.session.gschema.xml.in.in | 63 --------------------------------- 3 files changed, 67 insertions(+), 72 deletions(-) create mode 100644 data/org.mate.session.gschema.xml.in delete mode 100644 data/org.mate.session.gschema.xml.in.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 01b9bb1..a072618 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -21,12 +21,8 @@ endif @INTLTOOL_DESKTOP_RULE@ -org.mate.session.gschema.xml.in: org.mate.session.gschema.xml.in.in Makefile - $(AM_V_GEN)sed \ - -e "s|\@DEFAULT_WM\@|$(DEFAULT_WM)|" \ - $< > $@ - -gsettings_SCHEMAS = org.mate.session.gschema.xml +gsettingsschema_in_files = org.mate.session.gschema.xml.in +gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) @INTLTOOL_XML_NOMERGE_RULE@ @GSETTINGS_RULES@ @@ -36,7 +32,7 @@ convert_DATA = mate-session.convert EXTRA_DIST = \ mate-wm \ $(xsession_in_files) \ - $(gsettings_SCHEMAS).in.in \ + $(gsettingsschema_in_files) \ $(convert_DATA) \ $(ui_DATA) \ $(pixmap_DATA_dist) @@ -44,8 +40,7 @@ EXTRA_DIST = \ CLEANFILES = \ $(xsession_DATA) \ $(desktop_DATA) \ - $(gsettings_SCHEMAS).in \ - $(gsettings_SCHEMAS) \ + $(gsettings_SCHEMAS) \ mate-wm.desktop DISTCLEANFILES = \ diff --git a/data/org.mate.session.gschema.xml.in b/data/org.mate.session.gschema.xml.in new file mode 100644 index 0000000..06e8b46 --- /dev/null +++ b/data/org.mate.session.gschema.xml.in @@ -0,0 +1,63 @@ + + + + 0 + Current session start time + Unix time of the start of the current session. + + + false + Save sessions + If enabled, mate-session will save the session automatically. + + + true + Logout prompt + If enabled, mate-session will prompt the user before ending a session. + + + 60 + + Logout timeout + If logout prompt is enabled, this set the timeout in seconds before logout automatically. If 0, automatic logout is disabled. + + + 5 + Time before session is considered idle + The number of minutes of inactivity before the session is considered idle. + + + [ 'mate-settings-daemon' ] + Default session + List of applications that are part of the default session. + + + [ 'windowmanager', 'panel', 'filemanager' ] + Required session components + List of components that are required as part of the session. (Each element names a key under "/org/mate/desktop/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. + + + [ 'keyring', 'smproxy' ] + Control gnome compatibility component startup + Control which compatibility components to start. + + + + + + '@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. + + + '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. + + + '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 deleted file mode 100644 index c532471..0000000 --- a/data/org.mate.session.gschema.xml.in.in +++ /dev/null @@ -1,63 +0,0 @@ - - - - 0 - <_summary>Current session start time - <_description>Unix time of the start of the current session. - - - 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. - - - 60 - - <_summary>Logout timeout - <_description>If logout prompt is enabled, this set the timeout in seconds before logout automatically. If 0, automatic logout is disabled. - - - 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 "/org/mate/desktop/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. - - - [ 'keyring', 'smproxy' ] - <_summary>Control gnome compatibility component startup - <_description>Control which compatibility components to start. - - - - - - '@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