[vino/gnome-3-0] Add GConf to GSettings convert file, bug 654901

[David King <davidk src gnome org>]

commit 101f209e7280871495bb333c14c13708ce63f38c
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jul 6 17:45:59 2011 +0100

    Add GConf to GSettings convert file, bug 654901

 Makefile.am                   |    3 +++
 common/org.gnome.Vino.convert |   16 ++++++++++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index fda5f4d..ce56ae8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -297,6 +297,9 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
+convertdir = $(datadir)/GConf/gsettings
+dist_convert_DATA = common/org.gnome.Vino.convert
+
 if MAINTAINER_MODE
 dist-hook: dist-changelog
 else
diff --git a/common/org.gnome.Vino.convert b/common/org.gnome.Vino.convert
new file mode 100644
index 0000000..776a0e8
--- /dev/null
+++ b/common/org.gnome.Vino.convert
@@ -0,0 +1,16 @@
+[org.gnome.Vino]
+enabled = /desktop/gnome/remote_access/enabled
+prompt-enabled = /desktop/gnome/remote_access/prompt_enabled
+view-only = /desktop/gnome/remote_access/view_only
+network-interface = /desktop/gnome/remote_access/network_interface
+use-alternative-port = /desktop/gnome/remote_access/use_alternative_port
+alternative-port = /desktop/gnome/remote_access/alternative_port
+require-encryption = /desktop/gnome/remote_access/require_encryption
+authentication-methods = /desktop/gnome/remote_access/authentication_methods
+vnc-password = /desktop/gnome/remote_access/vnc_password
+mailto = /desktop/gnome/remote_access/mailto
+lock-screen-on-disconnect = /desktop/gnome/remote_access/lock_screen_on_disconnect
+icon-visibility = /desktop/gnome/remote_access/icon_visibility
+disable-background = /desktop/gnome/remote_access/disable_background
+use-upnp = /desktop/gnome/remote_access/use_upnp
+disable-xdamage = /desktop/gnome/remote_access/disable_xdamage