vinagre r160 - in trunk: . data po

[jwendell svn gnome org]

Author: jwendell
Date: Wed Jan 30 16:34:44 2008
New Revision: 160
URL: http://svn.gnome.org/viewvc/vinagre?rev=160&view=rev

Log:
2008-01-30  Jonh Wendell <jwendell gnome org>

	* Register vinagre in gconf as a handler to vnc:// protocol


Added:
   trunk/data/vinagre.schemas.in
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/data/   (props changed)
   trunk/data/Makefile.am
   trunk/po/POTFILES.in

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Jan 30 16:34:44 2008
@@ -50,6 +50,14 @@
 AC_SUBST(VINAGRE_CFLAGS)
 AC_SUBST(VINAGRE_LIBS)
 
+dnl ================================================================
+dnl GConf related settings
+dnl ================================================================
+
+AC_PATH_PROG(GCONFTOOL, gconftool-2)
+AM_GCONF_SOURCE_2
+
+
 #*******************************************************************************
 # Check for Avahi
 #*******************************************************************************

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Wed Jan 30 16:34:44 2008
@@ -18,16 +18,34 @@
 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
+
 CLEANFILES = \
 	$(desktop_DATA) \
-	$(mime_DATA)
+	$(mime_DATA) \
+	$(schemas_DATA)
 
 EXTRA_DIST = \
 	$(glade_DATA) \
 	$(man_MANS) \
 	$(ui_DATA) \
 	$(desktop_in_files) \
-	$(MIMEFILES)
+	$(MIMEFILES) \
+	$(schemas_in_files)
 
 UPDATE_MIME = \
         if [ -f $(DESTDIR)$(datadir)/mime/packages/freedesktop.org.xml ] ; then \

Added: trunk/data/vinagre.schemas.in
==============================================================================
--- (empty file)
+++ trunk/data/vinagre.schemas.in	Wed Jan 30 16:34:44 2008
@@ -0,0 +1,42 @@
+<gconfschemafile>
+ 	<schemalist>
+
+		<schema>
+			<key>/schemas/desktop/gnome/url-handlers/vnc/command</key>
+			<applyto>/desktop/gnome/url-handlers/vnc/command</applyto>
+			<owner>vinagre</owner>
+			<type>string</type>
+			<default>vinagre -u %s</default>
+			<locale name="C">
+				<short>The handler for "vnc://" URLs</short>
+				<long></long>
+			</locale>
+		</schema>
+
+        <schema>
+            <key>/schemas/desktop/gnome/url-handlers/vnc/needs_terminal</key>
+            <applyto>/desktop/gnome/url-handlers/vnc/needs_terminal</applyto>
+            <owner>vinagre</owner>
+            <type>bool</type>
+            <default>false</default>
+            <locale name="C">
+                <short></short>
+                <long></long>
+            </locale>
+        </schema>
+
+
+        <schema>
+            <key>/schemas/desktop/gnome/url-handlers/vnc/enabled</key>
+            <applyto>/desktop/gnome/url-handlers/vnc/enabled</applyto>
+            <owner>vinagre</owner>
+            <type>bool</type>
+            <default>true</default>
+            <locale name="C">
+                <short></short>
+                <long></long>
+            </locale>
+        </schema>
+
+	</schemalist>
+</gconfschemafile>

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Wed Jan 30 16:34:44 2008
@@ -3,6 +3,7 @@
 data/vinagre.desktop.in.in
 data/vinagre-file.desktop.in.in
 data/vinagre.glade
+data/vinagre.schemas.in
 data/vinagre-mime.xml.in
 data/vinagre-ui.xml
 src/vinagre-bookmarks.c