From 158883d78593629e381a3b9face53499d0a1cd4e Mon Sep 17 00:00:00 2001
From: Jason Conti <jason.conti@gmail.com>
Date: Wed, 5 Jun 2019 16:34:10 -0400
Subject: * Stop using gnome-autogen.sh
 (https://wiki.gnome.org/Projects/GnomeCommon/Migration)

---
 data/Makefile.am                                         |  8 +++++---
 ...t.launchpad.indicator.notifications.gschema.xml.in.in | 16 ++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 7299c5b..64e26bf 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,13 +3,15 @@ SUBDIRS = icons
 gsettings_file = net.launchpad.indicator.notifications.gschema.xml
 gsettings_SCHEMAS = $(gsettings_file)
 
-@INTLTOOL_XML_NOMERGE_RULE@
-
 $(gsettings_file).in: $(gsettings_file).in.in
-	sed \
+	$(AM_V_GEN) $(SED) \
 	  -e "s|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|" \
 	  $< > $@
 
+$(gsettings_file): $(gsettings_file).in
+	$(AM_V_GEN) $(MSGFMT) --xml -d $(top_srcdir)/po \
+		--template $< -o $@
+
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
diff --git a/data/net.launchpad.indicator.notifications.gschema.xml.in.in b/data/net.launchpad.indicator.notifications.gschema.xml.in.in
index a4c6dde..dc17a77 100644
--- a/data/net.launchpad.indicator.notifications.gschema.xml.in.in
+++ b/data/net.launchpad.indicator.notifications.gschema.xml.in.in
@@ -2,24 +2,24 @@
   <schema id="net.launchpad.indicator.notifications" path="/net/launchpad/indicator/notifications/">
     <key name="blacklist" type="as">
       <default>[]</default>
-      <_summary>Discard notifications by application name</_summary>
-      <_description>If an application name is in the blacklist, all notifications matching the application name will be discarded.</_description>
+      <summary>Discard notifications by application name</summary>
+      <description>If an application name is in the blacklist, all notifications matching the application name will be discarded.</description>
     </key>
     <key name="clear-on-middle-click" type="b">
       <default>false</default>
-      <_summary>Clear notifications on middle click</_summary>
-      <_description>Normally when middle clicking the notification icon, the unread status will be toggled if the queue is not empty. With this option enabled, the notification queue will be cleared instead.</_description>
+      <summary>Clear notifications on middle click</summary>
+      <description>Normally when middle clicking the notification icon, the unread status will be toggled if the queue is not empty. With this option enabled, the notification queue will be cleared instead.</description>
     </key>
     <key name="hide-indicator" type="b">
       <default>false</default>
-      <_summary>Hide the indicator</_summary>
-      <_description>If true, the indicator is hidden.</_description>
+      <summary>Hide the indicator</summary>
+      <description>If true, the indicator is hidden.</description>
     </key>
     <key name="max-items" type="i">
       <range min="1" max="10"/>
       <default>5</default>
-      <_summary>Maximum number of visible items</_summary>
-      <_description>The indicator will only display at most the number of notifications indicated by this value.</_description>
+      <summary>Maximum number of visible items</summary>
+      <description>The indicator will only display at most the number of notifications indicated by this value.</description>
     </key>
   </schema>
 </schemalist>
-- 
cgit v1.2.3