summaryrefslogtreecommitdiff
path: root/charpick
diff options
context:
space:
mode:
authorinfirit <[email protected]>2015-09-06 21:55:35 +0200
committerinfirit <[email protected]>2015-09-06 21:55:35 +0200
commitdf7a7488950139e3884972e2363294051e33d45d (patch)
treec442d94aba98b29a69a743701bf9a7d7a1086950 /charpick
parent6bfc67fc80ba929a740d20edd9ba34927dfefafe (diff)
downloadmate-applets-df7a7488950139e3884972e2363294051e33d45d.tar.bz2
mate-applets-df7a7488950139e3884972e2363294051e33d45d.tar.xz
Rework gsettings schema building
* Bump intltool required version for gsettings support * Extract strings with intltool directly * Let autoconf generate the xml files
Diffstat (limited to 'charpick')
-rw-r--r--charpick/Makefile.am10
-rw-r--r--charpick/org.mate.panel.applet.charpick.gschema.xml.in14
-rw-r--r--charpick/org.mate.panel.applet.charpick.gschema.xml.in.in14
3 files changed, 18 insertions, 20 deletions
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index b58c4c98..d1c6abda 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -41,21 +41,19 @@ org.mate.panel.applet.CharpickerAppletFactory.service: $(service_in_files)
-gsettings_SCHEMAS = org.mate.panel.applet.charpick.gschema.xml
+charpick_gschema_in_files = org.mate.panel.applet.charpick.gschema.xml.in
+gsettings_SCHEMAS = $(charpick_gschema_in_files:.xml.in=.xml)
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
- $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > [email protected]
-
uidir = $(datadir)/mate/ui
ui_DATA = charpick-applet-menu.xml
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
EXTRA_DIST = \
org.mate.applets.CharpickerApplet.mate-panel-applet.in.in \
$(service_in_files) \
$(ui_DATA) \
- $(gsettings_SCHEMAS).in.in
+ $(charpick_gschema_in_files)
-include $(top_srcdir)/git.mk
diff --git a/charpick/org.mate.panel.applet.charpick.gschema.xml.in b/charpick/org.mate.panel.applet.charpick.gschema.xml.in
new file mode 100644
index 00000000..9e4971c7
--- /dev/null
+++ b/charpick/org.mate.panel.applet.charpick.gschema.xml.in
@@ -0,0 +1,14 @@
+<schemalist gettext-domain="@[email protected]">
+ <schema id="org.mate.panel.applet.charpick">
+ <key name="current-list" type="s">
+ <default>''</default>
+ <summary>Characters shown on applet startup</summary>
+ <description>The string that the user had selected when the applet was last used. This string will be displayed when the user starts the applet.</description>
+ </key>
+ <key name="chartable" type="as">
+ <default>[]</default>
+ <summary>List of available palettes</summary>
+ <description>List of strings containing the available palettes.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/charpick/org.mate.panel.applet.charpick.gschema.xml.in.in b/charpick/org.mate.panel.applet.charpick.gschema.xml.in.in
deleted file mode 100644
index 555cc4b6..00000000
--- a/charpick/org.mate.panel.applet.charpick.gschema.xml.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-<schemalist gettext-domain="@[email protected]">
- <schema id="org.mate.panel.applet.charpick">
- <key name="current-list" type="s">
- <default>''</default>
- <_summary>Characters shown on applet startup</_summary>
- <_description>The string that the user had selected when the applet was last used. This string will be displayed when the user starts the applet.</_description>
- </key>
- <key name="chartable" type="as">
- <default>[]</default>
- <_summary>List of available palettes</_summary>
- <_description>List of strings containing the available palettes.</_description>
- </key>
- </schema>
-</schemalist>