Port logview to Gsettings (based on GNOME patches)

author: Brent Hull <[email protected]> 2012-11-15 14:23:32 -0500
committer: Brent Hull <[email protected]> 2012-11-15 14:23:32 -0500
commit: 1aa6079a48aacd1b495f6944848e3d432a4b115d (patch)
tree: c185cf295dfd1d80ffd4792088e179d001ae39a2 /logview/data
parent: 381d345351f1d3a0fb34bb125f1411af61ce67ad (diff)
download: mate-utils-1aa6079a48aacd1b495f6944848e3d432a4b115d.tar.bz2
mate-utils-1aa6079a48aacd1b495f6944848e3d432a4b115d.tar.xz
3 files changed, 42 insertions, 94 deletions
diff --git a/logview/data/Makefile.am b/logview/data/Makefile.am
index 04efb96a..eb96fcbb 100644
--- a/logview/data/Makefile.am
+++ b/logview/data/Makefile.am
@@ -10,27 +10,21 @@ $(desktop_in_files): $(desktop_in_files:.desktop.in=.desktop.in.in)
 
 man_MANS = mate-system-log.1
 
-schemasdir = $(MATECONF_SCHEMA_FILE_DIR)
-schemas_in_files = mate-system-log.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
+gsettingsschema_in_files = org.mate.system-log.gschema.xml.in
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
+.PRECIOUS: $(gsettings_SCHEMAS)
 
-install-data-local: $(schemas_DATA)
-if MATECONF_SCHEMAS_INSTALL
- if test -z "$(DESTDIR)" ; then \
- for p in $^ ; do \
- MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
- done \
- fi
-endif
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
 
 EXTRA_DIST = \
 mate-system-log.desktop.in.in \
 $(xml_DATA) \
 $(man_MANS) \
- $(schemas_in_files)
+ $(gsettingsschema_in_files)
 
 DISTCLEANFILES = \
 $(desktop_DATA) \
 $(desktop_in_files) \
- $(schemas_DATA)
+ $(gsettings_SCHEMAS)
diff --git a/logview/data/mate-system-log.schemas.in b/logview/data/mate-system-log.schemas.in
deleted file mode 100644
index 7961605f..00000000
--- a/logview/data/mate-system-log.schemas.in
+++ /dev/null
@@ -1,80 +0,0 @@
-<mateconfschemafile>
-
- <schemalist>
- <schema>
- <key>/schemas/apps/mate-system-log/logfile</key>
- <applyto>/apps/mate-system-log/logfile</applyto>
- <owner>logview</owner>
- <type>string</type>
- <default>/var/log/messages</default>
- <locale name="C">
- <short>Log file to open up on startup</short>
- <long>Specifies the log file displayed at startup.
- The default is either /var/adm/messages or 
- /var/log/messages, depending on your 
- operating system.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/mate-system-log/fontsize</key>
- <applyto>/apps/mate-system-log/fontsize</applyto>
- <owner>logview</owner>
- <type>int</type>
- <default>10</default>
- <locale name="C">
- <short>Size of the font used to display the log</short>
- <long>Specifies the size of the fixed-width font used
- to display the log in the main tree view.
- The default is taken from the default terminal
- font size.
- </long>
- </locale>
- </schema>
- 
- <schema>
- <key>/schemas/apps/mate-system-log/height</key>
- <applyto>/apps/mate-system-log/height</applyto>
- <owner>logview</owner>
- <type>int</type>
- <default>400</default>
- <locale name="C">
- <short>Height of the main window in pixels</short>
- <long>Specifies the height of the log viewer main window
- in pixels.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/mate-system-log/width</key>
- <applyto>/apps/mate-system-log/width</applyto>
- <owner>logview</owner>
- <type>int</type>
- <default>600</default>
- <locale name="C">
- <short>Width of the main window in pixels</short>
- <long>Specifies the width of the log viewer main window
- in pixels.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/mate-system-log/logfiles</key>
- <applyto>/apps/mate-system-log/logfiles</applyto>
- <owner>logview</owner>
- <type>list</type>
- <list_type>string</list_type>
- <locale name="C">
- <short>Log files to open up on startup</short>
- <long>Specifies a list of log files to open up at startup.
- A default list is created by reading /etc/syslog.conf.
- </long>
- </locale>
- </schema>
-
- </schemalist>
- 
-</mateconfschemafile>
diff --git a/logview/data/org.mate.system-log.gschema.xml.in b/logview/data/org.mate.system-log.gschema.xml.in
new file mode 100644
index 00000000..0f00134e
--- /dev/null
+++ b/logview/data/org.mate.system-log.gschema.xml.in
@@ -0,0 +1,34 @@
+<schemalist gettext-domain="mate-utils-2.0">
+ <schema id="org.mate.system-log" path="/org/mate/system-log/">
+ <key name="logfile" type="s">
+ <default>'/var/log/messages'</default>
+ <_summary>Log file to open up on startup</_summary>
+ <_description>Specifies the log file displayed at startup. The default is either /var/adm/messages or /var/log/messages, depending on your operating system.</_description>
+ </key>
+ <key name="fontsize" type="i">
+ <default>10</default>
+ <_summary>Size of the font used to display the log</_summary>
+ <_description>Specifies the size of the fixed-width font used to display the log in the main tree view. The default is taken from the default terminal font size.</_description>
+ </key>
+ <key name="height" type="i">
+ <default>400</default>
+ <_summary>Height of the main window in pixels</_summary>
+ <_description>Specifies the height of the log viewer main window in pixels.</_description>
+ </key>
+ <key name="width" type="i">
+ <default>600</default>
+ <_summary>Width of the main window in pixels</_summary>
+ <_description>Specifies the width of the log viewer main window in pixels.</_description>
+ </key>
+ <key name="logfiles" type="as">
+ <default>[]</default>
+ <_summary>Log files to open up on startup</_summary>
+ <_description>Specifies a list of log files to open up at startup. A default list is created by reading /etc/syslog.conf.</_description>
+ </key>
+ <key name="filters" type="as">
+ <default>[]</default>
+ <_summary>List of saved filters</_summary>
+ <_description>List of saved regexp filters</_description>
+ </key>
+ </schema>
+</schemalist>
author	Brent Hull <[email protected]>	2012-11-15 14:23:32 -0500
committer	Brent Hull <[email protected]>	2012-11-15 14:23:32 -0500
commit	1aa6079a48aacd1b495f6944848e3d432a4b115d (patch)
tree	c185cf295dfd1d80ffd4792088e179d001ae39a2 /logview/data
parent	381d345351f1d3a0fb34bb125f1411af61ce67ad (diff)
download	mate-utils-1aa6079a48aacd1b495f6944848e3d432a4b115d.tar.bz2 mate-utils-1aa6079a48aacd1b495f6944848e3d432a4b115d.tar.xz