diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | data/Makefile.am | 13 | ||||
| -rw-r--r-- | data/org.mate.session.gschema.xml.in | 63 | ||||
| -rw-r--r-- | data/org.mate.session.gschema.xml.in.in | 63 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 |
5 files changed, 70 insertions, 74 deletions
diff --git a/configure.ac b/configure.ac index 9be9458..84d041c 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AM_MAINTAINER_MODE MATE_COMMON_INIT MATE_DEBUG_CHECK -IT_PROG_INTLTOOL([0.40.0]) +IT_PROG_INTLTOOL([0.50.1]) AC_PROG_CC AC_STDC_HEADERS @@ -331,6 +331,7 @@ doc/man/Makefile data/Makefile data/mate-wm.desktop.in data/mate-session-properties.desktop.in +data/org.mate.session.gschema.xml data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile 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 @@ +<schemalist gettext-domain="@GETTEXT_PACKAGE@"> + <schema id="org.mate.session" path="/org/mate/desktop/session/"> + <key name="session-start" type="i"> + <default>0</default> + <summary>Current session start time</summary> + <description>Unix time of the start of the current session.</description> + </key> + <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="logout-timeout" type="i"> + <default>60</default> + <range min="0" max="300"/> + <summary>Logout timeout</summary> + <description>If logout prompt is enabled, this set the timeout in seconds before logout automatically. If 0, automatic logout is disabled.</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 "/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.</description> + </key> + <key name="gnome-compat-startup" type="as"> + <default>[ 'keyring', 'smproxy' ]</default> + <summary>Control gnome compatibility component startup</summary> + <description>Control which compatibility components to start.</description> + </key> + <child name="required-components" schema="org.mate.session.required-components"/> + </schema> + <schema id="org.mate.session.required-components" path="/org/mate/desktop/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> 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 @@ -<schemalist> - <schema id="org.mate.session" path="/org/mate/desktop/session/"> - <key name="session-start" type="i"> - <default>0</default> - <_summary>Current session start time</_summary> - <_description>Unix time of the start of the current session.</_description> - </key> - <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="logout-timeout" type="i"> - <default>60</default> - <range min="0" max="300"/> - <_summary>Logout timeout</_summary> - <_description>If logout prompt is enabled, this set the timeout in seconds before logout automatically. If 0, automatic logout is disabled.</_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 "/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.</_description> - </key> - <key name="gnome-compat-startup" type="as"> - <default>[ 'keyring', 'smproxy' ]</default> - <_summary>Control gnome compatibility component startup</_summary> - <_description>Control which compatibility components to start.</_description> - </key> - <child name="required-components" schema="org.mate.session.required-components"/> - </schema> - <schema id="org.mate.session.required-components" path="/org/mate/desktop/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> diff --git a/po/POTFILES.in b/po/POTFILES.in index e59589e..0c8ccba 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,7 +4,7 @@ capplet/gsm-app-dialog.c capplet/gsm-properties-dialog.c capplet/gsp-app.c capplet/main.c -data/org.mate.session.gschema.xml.in.in +[type: gettext/gsettings]data/org.mate.session.gschema.xml.in data/mate.desktop.in data/mate-wm.desktop.in.in [type: gettext/glade]data/gsm-inhibit-dialog.ui |