GNOME.org
 

[vino] Depend on intltool 0.50 for GSettings translations

commit 1ab65cd0f91211e37290cf11dd971c879b094be4
Author: David King <amigadave amigadave com>
Date:   Mon Jun 4 20:20:03 2012 +0100

    Depend on intltool 0.50 for GSettings translations

 .gitignore                                         |    1 -
 Makefile.am                                        |    8 +--
 ...o.gschema.xml.in => org.gnome.Vino.gschema.xml} |   96 ++++++++++----------
 configure.ac                                       |    2 +-
 po/POTFILES.in                                     |    2 +-
 5 files changed, 52 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 061f594..11447d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@ Makefile.in
 /common/*.o
 /common/.deps
 /common/.dirstamp
-/common/org.gnome.Vino.gschema.xml
 /config.log
 /config.h
 /config.h.in
diff --git a/Makefile.am b/Makefile.am
index e5567af..c9f90eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -305,10 +305,8 @@ nodist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 # GSettings schemas, enum files and conversion file
 gsettings_ENUM_NAMESPACE = org.gnome.Vino
 gsettings_ENUM_FILES = capplet/vino-preferences.c
-gsettings_in_file = common/org.gnome.Vino.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+gsettings_SCHEMAS = common/org.gnome.Vino.gschema.xml
 
- INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 convertdir = $(datadir)/GConf/gsettings
@@ -333,8 +331,7 @@ dist-changelog:
 dist_noinst_DATA = \
 	$(desktop_in_files) \
 	\
-	common/org.gnome.Vino.gschema.xml \
-	$(gsettings_in_file) \
+	$(gsettings_SCHEMAS) \
 	\
 	docs/remote-desktop.txt \
 	docs/debugging.txt \
@@ -363,7 +360,6 @@ dist_noinst_SCRIPTS = autogen.sh
 
 CLEANFILES = \
 	$(nodist_desktop_DATA) \
-	$(gsettings_SCHEMAS) \
 	$(nodist_service_DATA) \
 	$(marshal_data) \
 	$(enum_data) \
diff --git a/common/org.gnome.Vino.gschema.xml.in b/common/org.gnome.Vino.gschema.xml
similarity index 72%
rename from common/org.gnome.Vino.gschema.xml.in
rename to common/org.gnome.Vino.gschema.xml
index 821c4e2..16b1b35 100644
--- a/common/org.gnome.Vino.gschema.xml.in
+++ b/common/org.gnome.Vino.gschema.xml
@@ -1,80 +1,80 @@
 <schemalist>
   <schema id='org.gnome.Vino' path='/desktop/gnome/remote-access/'>
     <key name='enabled' type='b'>
-      <_summary>Enable remote access to the desktop</_summary>
-      <_description>
+      <summary>Enable remote access to the desktop</summary>
+      <description>
         If true, allows remote access to the desktop via the RFB
         protocol. Users on remote machines may then connect to the
-        desktop using a VNC viewer.</_description>
+        desktop using a VNC viewer.</description>
       <default>false</default>
     </key>
 
     <key name='prompt-enabled' type='b'>
-      <_summary>Prompt the user before completing a connection</_summary>
-      <_description>
+      <summary>Prompt the user before completing a connection</summary>
+      <description>
         If true, remote users accessing the desktop are not allowed
         access until the user on the host machine approves the
         connection.  Recommended especially when access is not password
         protected.
-      </_description>
+      </description>
       <default>true</default>
     </key>
 
     <key name='view-only' type='b'>
-      <_summary>Only allow remote users to view the desktop</_summary>
-      <_description>
+      <summary>Only allow remote users to view the desktop</summary>
+      <description>
         If true, remote users accessing the desktop are only allowed to
         view the desktop. Remote users will not be able to use the mouse
         or keyboard.
-      </_description>
+      </description>
       <default>false</default>
     </key>
 
     <key name='network-interface' type='s'>
-      <_summary>Network interface for listening</_summary>
-      <_description>
+      <summary>Network interface for listening</summary>
+      <description>
         If not set, the server will listen on all network interfaces.
 
         Set this if you want that accept connections only from some
         specific network interface. eg: eth0, wifi0, lo, ...
-      </_description>
+      </description>
       <default>''</default>
     </key>
 
     <key name='use-alternative-port' type='b'>
-      <_summary>Listen on an alternative port</_summary>
-      <_description>
+      <summary>Listen on an alternative port</summary>
+      <description>
         If true, the server will listen to another port, instead of the
         default (5900). The port must be specified in the
         'alternative-port' key.
-      </_description>
+      </description>
       <default>false</default>
     </key>
 
     <key name='alternative-port' type='q'>
-      <_summary>Alternative port number</_summary>
-      <_description>
+      <summary>Alternative port number</summary>
+      <description>
         The port which the server will listen to if the
         'use-alternative-port' key is set to true.  Valid values are in
         the range from 5000 to 50000.
-      </_description>
+      </description>
       <default>5900</default>
     </key>
 
     <key name='require-encryption' type='b'>
-      <_summary>Require encryption</_summary>
-      <_description>
+      <summary>Require encryption</summary>
+      <description>
         If true, remote users accessing the desktop are required to
         support encryption. It is highly recommended that you use a
         client which supports encryption unless the intervening network
         is trusted.
-      </_description>
+      </description>
       <default>false</default>
     </key>
 
     <key name='authentication-methods' type='as'>
-      <_summary>Allowed authentication methods</_summary>
-      <_description>
+      <summary>Allowed authentication methods</summary>
+      <description>
         Lists the authentication methods with which remote users may
         access the desktop.
 
@@ -82,7 +82,7 @@
         remote user to be prompted for a password (the password is
         specified by the vnc-password key) before connecting and "none"
         which allows any remote user to connect.
-      </_description>
+      </description>
       <choices>
         <choice value='none'/>
         <choice value='vnc'/>
@@ -91,82 +91,82 @@
     </key>
 
     <key name='vnc-password' type='s'>
-      <_summary>Password required for "vnc" authentication</_summary>
-      <_description>
+      <summary>Password required for "vnc" authentication</summary>
+      <description>
         The password which the remote user will be prompted for if the
         "vnc" authentication method is used. The password specified by
         the key is base64 encoded.
 
         The special value of 'keyring' (which is not valid base64) means
         that the password is stored in the GNOME keyring.
-      </_description>
+      </description>
       <default>'keyring'</default>
     </key>
 
     <key name='mailto' type='s'>
-      <_summary>E-mail address to which the remote desktop URL should be sent</_summary>
-      <_description>
+      <summary>E-mail address to which the remote desktop URL should be sent</summary>
+      <description>
         This key specifies the e-mail address to which the remote
         desktop URL should be sent if the user clicks on the URL in the
         Desktop Sharing preferences dialog.
-      </_description>
+      </description>
       <default>''</default>
     </key>
 
     <key name='lock-screen-on-disconnect' type='b'>
-      <_summary>Lock the screen when last user disconnect</_summary>
-      <_description>
+      <summary>Lock the screen when last user disconnect</summary>
+      <description>
         If true, screen will be locked after the last remote client
         disconnect.
-      </_description>
+      </description>
       <default>false</default>
     </key>
 
     <key name='icon-visibility' enum="org.gnome.Vino.VinoIconVisibility">
-      <_summary>When the status icon should be shown</_summary>
-      <_description>
+      <summary>When the status icon should be shown</summary>
+      <description>
         This key controls the behavior of the status icon. There are
         three options: "always" - The icon will be always there;
         "client" - You will see the icon only when there is someone
         connected, this is the default behavior; "never" - Never shows
         the icon.
-      </_description>
+      </description>
       <default>'client'</default>
     </key>
 
     <key name='disable-background' type='b'>
-      <_summary>When true, disable the background on receive valid session</_summary>
-      <_description>
+      <summary>When true, disable the background on receive valid session</summary>
+      <description>
         When true, disable the background on receive valid session
-      </_description>
+      </description>
       <default>false</default>
     </key>
 
     <key name='use-upnp' type='b'>
-      <_summary>Whether we should use UPNP to forward the port in routers</_summary>
-      <_description>
+      <summary>Whether we should use UPNP to forward the port in routers</summary>
+      <description>
         If true, we will use UPNP protocol to automatically forward the
         port used by vino in the router.
-      </_description>
+      </description>
       <default>false</default>
     </key>
 
     <key name='disable-xdamage' type='b'>
-      <_summary>Whether we should disable the XDamage extension of X.org</_summary>
-      <_description>
+      <summary>Whether we should disable the XDamage extension of X.org</summary>
+      <description>
         If true, we will not use the XDamage extension of X.org. This
         extension does not work properly on some video drivers when
         using 3D effects.  Disabling it will make vino work on these
         environments with a slower rendering as side effect.
-      </_description>
+      </description>
       <default>false</default>
     </key>
 
     <key name='notify-on-connect' type='b'>
-      <_summary>Notify on connect</_summary>
-      <_description>
+      <summary>Notify on connect</summary>
+      <description>
         If true, we will notify, when the user connects to the system.
-      </_description>
+      </description>
       <default>true</default>
     </key>
   </schema>
diff --git a/configure.ac b/configure.ac
index 8a54613..3a6c5e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -238,7 +238,7 @@ AS_IF([test "x$have_jpeg" = "xyes"],
 # Internationalization
 AC_SUBST([GETTEXT_PACKAGE],[$PACKAGE_TARNAME])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [gettext package])
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.50.0])
 
 # Check for XDAMAGE extension
 AC_CHECK_HEADER([X11/extensions/Xdamage.h],
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 87c1686..5ab5c4e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@
 capplet/vino-message-box.c
 capplet/vino-preferences.c
 capplet/vino-preferences.desktop.in.in
-common/org.gnome.Vino.gschema.xml.in
+common/org.gnome.Vino.gschema.xml
 [type: gettext/glade]capplet/vino-preferences.ui
 server/smclient/eggdesktopfile.c
 server/smclient/eggsmclient.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]