core: Use intltool 0.50’s enhanced GSettings support

This bumps our intltool dependency to 0.50.0, but means we can simplify the
build for GSettings schemas.

See: https://bugzilla.gnome.org/show_bug.cgi?id=647909

diff --git a/NEWS b/NEWS
index d668951..bf6ae89 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Dependencies:
 • telepathy-glib ≥ 0.17.5
 • GLib ≥ 2.26.0
 • GConf dependency dropped
+• intltool ≥ 0.50.0
 
 Bugs fixed:
 • Bug 674256 — telepathy-glib minimal version is insufficient

diff --git a/configure.ac b/configure.ac
index 0592fad..aacd61a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -400,7 +400,7 @@ fi
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50.0])
 
 # -----------------------------------------------------------
 # Error flags
@@ -521,7 +521,7 @@ AC_CONFIG_FILES([
     backends/eds/lib/folks-eds-uninstalled.pc
     folks/folks.pc
     folks/folks-uninstalled.pc
-    folks/org.freedesktop.folks.gschema.xml.in
+    folks/org.freedesktop.folks.gschema.xml
     Makefile
     backends/Makefile
     backends/key-file/Makefile

diff --git a/folks/Makefile.am b/folks/Makefile.am
index 74e2983..a9262a2 100644 (file)
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -209,7 +209,6 @@ MAINTAINERCLEANFILES += \
 gsettings_SCHEMAS = org.freedesktop.folks.gschema.xml
 
 @GSETTINGS_RULES@
-@INTLTOOL_XML_NOMERGE_RULE@
 
 # Data migration tool
 convertdir = $(datadir)/GConf/gsettings

diff --git a/folks/org.freedesktop.folks.gschema.xml.in.in b/folks/org.freedesktop.folks.gschema.xml.in
similarity index 59%
rename from folks/org.freedesktop.folks.gschema.xml.in.in
rename to folks/org.freedesktop.folks.gschema.xml.in
index 011051a..372a173 100644 (file)
--- a/folks/org.freedesktop.folks.gschema.xml.in.in
+++ b/folks/org.freedesktop.folks.gschema.xml.in
@@ -3,10 +3,10 @@
   <schema id="org.freedesktop.folks" path="/org/freedesktop/folks/" gettext-domain="@GETTEXT_PACKAGE@">
     <key name="primary-store" type="s">
       <default>''</default>
-      <_summary>Primary store ID</_summary>
-      <_description>The ID of the persona store which folks should use as primary (i.e. to store linking data in).
+      <summary>Primary store ID</summary>
+      <description>The ID of the persona store which folks should use as primary (i.e. to store linking data in).
           The type ID of the store may optionally be prepended, separated by a colon.
-          For example: “eds:system” or “key-file”.</_description>
+          For example: “eds:system” or “key-file”.</description>
     </key>
   </schema>
 </schemalist>

diff --git a/po/POTFILES.in b/po/POTFILES.in
index f872a17..20b9f9c 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -21,7 +21,7 @@ folks/individual-aggregator.vala
 folks/local-id-details.vala
 folks/name-details.vala
 folks/note-details.vala
-folks/org.freedesktop.folks.gschema.xml.in.in
+[type: gettext/gsettings]folks/org.freedesktop.folks.gschema.xml.in
 folks/phone-details.vala
 folks/postal-address-details.vala
 folks/role-details.vala

diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 171ae77..a27b962 100644 (file)
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -20,7 +20,6 @@ folks/individual-aggregator.c
 folks/local-id-details.c
 folks/name-details.c
 folks/note-details.c
-folks/org.freedesktop.folks.gschema.xml.in
 folks/phone-details.c
 folks/postal-address-details.c
 folks/role-details.c