[vinagre] gsettings: convert gconf schema

[Marc-Andre Lureau <malureau src gnome org>]

commit 8382f550ce70b2a459b8bf812fd5822ab49a4456
Author: Marc-André Lureau <marcandre lureau redhat com>
Date:   Wed Feb 23 14:18:38 2011 +0100

    gsettings: convert gconf schema
    
    https://bugzilla.gnome.org/show_bug.cgi?id=625895

 configure.ac                       |    5 +-
 data/.gitignore                    |   32 ++++++++++
 data/Makefile.am                   |   21 +------
 data/org.gnome.Vinagre.gschema.xml |   35 +++++++++++
 data/vinagre.schemas.in.in         |  113 ------------------------------------
 po/POTFILES.in                     |    1 -
 6 files changed, 73 insertions(+), 134 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d0b45a0..c8742e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -224,6 +224,8 @@ dnl ================================================================
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
 AM_GCONF_SOURCE_2
 
+GLIB_GSETTINGS
+
 dnl Check for bind in libsocket (needed on Solaris)
 AC_CHECK_LIB(socket, bind)
 
@@ -267,7 +269,7 @@ if test "x$ac_cv_header_ifaddrs_h" = "xyes"; then
 fi
 
 
-dnl active plugins for vinagre.schemas
+dnl active plugins for org.gnome.Vinagre.gschema.xml
 ACTIVE_PLUGINS="vnc"
 if test "x$enable_ssh" = "xyes" ; then
 ACTIVE_PLUGINS="$ACTIVE_PLUGINS,ssh"
@@ -303,7 +305,6 @@ data/Makefile
 data/vinagre.desktop.in
 data/vinagre-file.desktop.in
 data/vinagre.pc
-data/vinagre.schemas.in
 data/icons/Makefile
 help/Makefile
 po/Makefile.in
diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 0000000..a5fd0a8
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1,32 @@
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
+/org.freedesktop.Telepathy.Client.Vinagre.service
+/so_locations
+/tags
+/vinagre-1.0.pc
+/vinagre-file.desktop
+/vinagre-file.desktop.in
+/vinagre-mime.xml
+/vinagre.desktop
+/vinagre.desktop.in
+/vinagre.pc
+/vinagre.schemas.in
+/*.gschema.valid
diff --git a/data/Makefile.am b/data/Makefile.am
index a4cf352..7cd3e61 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -21,26 +21,12 @@ MIMEFILES = vinagre-mime.xml.in
 mimedir = $(datadir)/mime/packages
 mime_DATA = vinagre-mime.xml
 
-schemasdir	 = $(GCONF_SCHEMA_FILE_DIR)
-schemas_in_files = vinagre.schemas.in
-schemas_DATA 	 = $(schemas_in_files:.schemas.in=.schemas)
- INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	if test -z "$(DESTDIR)" ; then \
-		for p in $(schemas_DATA) ; do \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
-		done \
-	fi
-else
-install-data-local:
-endif
+gsettings_SCHEMAS = org.gnome.Vinagre.gschema.xml
+ GSETTINGS_RULES@
 
 CLEANFILES = \
 	$(desktop_DATA) \
 	$(mime_DATA) \
-	$(schemas_DATA) \
 	$(pkgconfig_DATA) \
 	org.freedesktop.Telepathy.Client.Vinagre.service
 
@@ -50,9 +36,8 @@ EXTRA_DIST = \
 	$(ui_DATA) \
 	$(desktop_in_files) \
 	$(MIMEFILES) \
-	$(schemas_in_files) \
+	$(gsettings_SCHEMAS) \
 	vinagre.pc.in \
-	vinagre.schemas.in.in \
 	Vinagre.client \
 	org.freedesktop.Telepathy.Client.Vinagre.service.in
 
diff --git a/data/org.gnome.Vinagre.gschema.xml b/data/org.gnome.Vinagre.gschema.xml
new file mode 100644
index 0000000..5121bc4
--- /dev/null
+++ b/data/org.gnome.Vinagre.gschema.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<schemalist>
+  <schema id="org.gnome.Vinagre" path="/org/gnome/vinagre/">
+    <key name="shared-flag" type="b">
+      <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 name="always-show-tabs" type="b">
+      <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 name="show-accels" type="b">
+      <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 name="history-size" type="i">
+      <default>15</default>
+      <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 name="always-enable-listening" type="b">
+      <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>
+    <key name="active-plugins" type="as">
+      <default>[ 'vnc' ]</default>
+      <summary>Active plugins</summary>
+      <description>List of active plugins. It contains the "Location" of the active plugins. See the .vinagre-plugin file for obtaining the "Location" of a given plugin.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d987545..925d2ac 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,6 @@ data/GNOME_VinagreApplet.xml
 data/vinagre.desktop.in.in
 data/vinagre-file.desktop.in.in
 [type: gettext/glade]data/vinagre.ui
-data/vinagre.schemas.in.in
 data/vinagre-mime.xml.in
 data/vinagre-ui.xml
 plugins/rdp/rdp.plugin.desktop.in