[vinagre] Depend on intltool 0.50 for GSettings translations

[David King <davidk src gnome org>]

commit cc1254a97f4fc2c02369e6b4ef48713d4afce0b2
Author: David King <amigadave amigadave com>
Date:   Mon Jun 4 20:49:57 2012 +0100

    Depend on intltool 0.50 for GSettings translations

 .gitignore                            |    2 +-
 Makefile.am                           |   11 ++---------
 configure.ac                          |    2 +-
 data/org.gnome.Vinagre.gschema.xml    |   31 +++++++++++++++++++++++++++++++
 data/org.gnome.Vinagre.gschema.xml.in |   31 -------------------------------
 po/POTFILES.in                        |    2 +-
 6 files changed, 36 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5013fbb..887bc43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@ Makefile.in
 /configure
 /data/org.freedesktop.Telepathy.Client.Vinagre.service
 /data/org.gnome.Vinagre.gschema.valid
-/data/org.gnome.Vinagre.gschema.xml
 /data/vinagre-file.desktop
 /data/vinagre-file.desktop.in
 /data/vinagre-mime.xml
@@ -24,6 +23,7 @@ Makefile.in
 /data/vinagre.desktop.in
 /help/*/*.mo
 /help/*/*.page
+/help/*/*.stamp
 !/help/C
 /intltool-extract.in
 /intltool-merge.in
diff --git a/Makefile.am b/Makefile.am
index f8ef1fb..5c11e5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -255,13 +255,7 @@ nodist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 mimedir = $(datadir)/mime/packages
 nodist_mime_DATA = data/vinagre-mime.xml
 
-gsettings_in_file = data/org.gnome.Vinagre.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
-# @INTLTOOL_XML_NOMERGE_RULE@
-# This rule is overriden by the above INTLTOOL_XML_RULE macro.
-# Here is the workaround. Could break if intltools changes arguments.
-$(gsettings_SCHEMAS): $(gsettings_in_file) $(INTLTOOL_MERGE)
-	 LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
+gsettings_SCHEMAS = data/org.gnome.Vinagre.gschema.xml
 
 @GSETTINGS_RULES@
 
@@ -305,7 +299,7 @@ dist_noinst_DATA = \
 	ChangeLog.pre-git \
 	data/vinagre-mime.xml.in \
 	$(desktop_in_files) \
-	$(gsettings_in_file) \
+	$(gsettings_SCHEMAS) \
 	$(service_in_file) \
 	intltool-extract.in \
 	intltool-merge.in \
@@ -316,7 +310,6 @@ dist_noinst_DATA = \
 CLEANFILES = \
 	$(nodist_desktop_DATA) \
 	$(nodist_mime_DATA) \
-	$(gsettings_SCHEMAS) \
 	$(nodist_pkgconfig_DATA) \
 	$(nodist_service_DATA)
 
diff --git a/configure.ac b/configure.ac
index 0545d87..16ab748 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,7 +106,7 @@ AC_CHECK_HEADERS([ifaddrs.h sys/un.h stropts.h termios.h utmp.h])
 # Internationalization.
 AC_SUBST([GETTEXT_PACKAGE], [$PACKAGE_TARNAME])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [GETTEXT package name])
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.50.0])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
diff --git a/data/org.gnome.Vinagre.gschema.xml b/data/org.gnome.Vinagre.gschema.xml
new file mode 100644
index 0000000..76935d4
--- /dev/null
+++ b/data/org.gnome.Vinagre.gschema.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema path="/org/gnome/vinagre/" id="org.gnome.Vinagre">
+    <key type="b" name="shared-flag">
+      <default>true</default>
+      <summary>Whether we should leave other clients connected</summary>
+      <description>When connecting to a host, the client can say to the server to leave other clients connected or to drop the existent connections. Set the value to true to share the desktop with the other clients.</description>
+    </key>
+    <key type="b" name="always-show-tabs">
+      <default>false</default>
+      <summary>Whether we should show tabs even when there is only one active connection</summary>
+      <description>Set to "true" to always show the tabs. Set to "false" to only show the tabs when there is more than one active connection.</description>
+    </key>
+    <key type="b" name="show-accels">
+      <default>false</default>
+      <summary>Whether we should show the menu accelerators (shortcut keys)</summary>
+      <description>Set to "false" to disable menu shortcuts. Set to "true" to enable them. Note that if they are enabled, those keys will be intercepted by the menu and will not be sent to the remote host.</description>
+    </key>
+    <key type="i" name="history-size">
+      <default>15</default>
+      <range min="0" max="65535"/>
+      <summary>Maximum number of history items in connect dialog</summary>
+      <description>Specifies the maximum number of items in the host dropdown entry.</description>
+    </key>
+    <key type="b" name="always-enable-listening">
+      <default>false</default>
+      <summary>Whether we should start the program listening for reverse connections</summary>
+      <description>Set to "true" to always start the program listening for reverse connections.</description>
+    </key>
+  </schema>
+</schemalist>
\ No newline at end of file
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 82bf72b..e4bf8fb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of source files containing translatable strings.
 
-data/org.gnome.Vinagre.gschema.xml.in
+data/org.gnome.Vinagre.gschema.xml
 data/vinagre.desktop.in.in
 data/vinagre-file.desktop.in.in
 [type: gettext/glade]data/vinagre.ui