Rework gsettings schema building

* Bump intltool required version for gsettings support
* Extract strings with intltool directly
* Let autoconf generate the xml files

4 files changed, 34 insertions, 35 deletions

diff --git a/configure.ac b/configure.ac
index a910a7b..3ddb637 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,7 @@ LT_INIT
 dnl ---------------------------------------------------------------------------
 dnl i18n stuff
 dnl ---------------------------------------------------------------------------
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.50.1])
 AC_SUBST([GETTEXT_PACKAGE], [mate-notification-daemon])
 AM_GLIB_GNU_GETTEXT
 AC_DEFINE([GETTEXT_PACKAGE], [PACKAGE_TARNAME], [Define to the gettext package name.])
@@ -263,6 +263,7 @@ AC_CONFIG_FILES([
 Makefile
 data/Makefile
 data/org.freedesktop.mate.Notifications.service
+data/org.mate.NotificationDaemon.gschema.xml
 po/Makefile.in
 src/Makefile
 src/daemon/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 1aec612..a972ef1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,18 +16,16 @@ iconscalable_DATA = icons/scalable/mate-notification-properties.svg
 servicedir   = $(DBUS_SERVICES_DIR)
 service_DATA = org.freedesktop.mate.Notifications.service
 
-gsettings_SCHEMAS = org.mate.NotificationDaemon.gschema.xml
+gsettingsschema_in_files = org.mate.NotificationDaemon.gschema.xml.in
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-	$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
 convertdir = $(datadir)/MateConf/gsettings
 convert_DATA = mate-notification-daemon.convert
 
 EXTRA_DIST = \
-	$(gsettings_SCHEMAS).in.in \
+	$(gsettingsschema_in_files) \
 	$(convert_DATA) \
 	$(service_DATA) \
 	$(icon16_DATA) \
diff --git a/data/org.mate.NotificationDaemon.gschema.xml.in b/data/org.mate.NotificationDaemon.gschema.xml.in
new file mode 100644
index 0000000..c3c615b
--- /dev/null
+++ b/data/org.mate.NotificationDaemon.gschema.xml.in
@@ -0,0 +1,29 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.NotificationDaemon" path="/org/mate/notification-daemon/">
+    <key name="popup-location" type="s">
+      <default>'top_right'</default>
+      <summary>Popup location</summary>
+      <description>Default popup location on the workspace for stack notifications. Allowed values: "top_left","top_right","bottom_left" and "bottom_right"</description>
+    </key>
+    <key name="use-active-monitor" type="b">
+      <default>true</default>
+      <summary>Use Active Monitor</summary>
+      <description>Display the notification on the active monitor.</description>
+    </key>
+    <key name="monitor-number" type="i">
+      <default>0</default>
+      <summary>Monitor</summary>
+      <description>Monitor to display the notification. Allowed values: -1 (display on active monitor) and 0 to n - 1 where n is the number of monitors.</description>
+    </key>
+    <key name="theme" type="s">
+      <default>'nodoka'</default>
+      <summary>Current theme</summary>
+      <description>The theme used when displaying notifications.</description>
+    </key>
+    <key name="sound-enabled" type="b">
+      <default>true</default>
+      <summary>Sound Enabled</summary>
+      <description>Turns on and off sound support for notifications.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.mate.NotificationDaemon.gschema.xml.in.in b/data/org.mate.NotificationDaemon.gschema.xml.in.in
deleted file mode 100644
index fc51a77..0000000
--- a/data/org.mate.NotificationDaemon.gschema.xml.in.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.NotificationDaemon" path="/org/mate/notification-daemon/">
-    <key name="popup-location" type="s">
-      <default>'top_right'</default>
-      <_summary>Popup location</_summary>
-      <_description>Default popup location on the workspace for stack notifications. Allowed values: "top_left","top_right","bottom_left" and "bottom_right"</_description>
-    </key>
-    <key name="use-active-monitor" type="b">
-      <default>true</default>
-      <_summary>Use Active Monitor</_summary>
-      <_description>Display the notification on the active monitor.</_description>
-    </key>
-    <key name="monitor-number" type="i">
-      <default>0</default>
-      <_summary>Monitor</_summary>
-      <_description>Monitor to display the notification. Allowed values: -1 (display on active monitor) and 0 to n - 1 where n is the number of monitors.</_description>
-    </key>
-    <key name="theme" type="s">
-      <default>'nodoka'</default>
-      <_summary>Current theme</_summary>
-      <_description>The theme used when displaying notifications.</_description>
-    </key>
-    <key name="sound-enabled" type="b">
-      <default>true</default>
-      <_summary>Sound Enabled</_summary>
-      <_description>Turns on and off sound support for notifications.</_description>
-    </key>
-  </schema>
-</schemalist>