Commit 8382f550 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

gsettings: convert gconf schema

https://bugzilla.gnome.org/show_bug.cgi?id=625895
parent ada19066
...@@ -224,6 +224,8 @@ dnl ================================================================ ...@@ -224,6 +224,8 @@ dnl ================================================================
AC_PATH_PROG(GCONFTOOL, gconftool-2) AC_PATH_PROG(GCONFTOOL, gconftool-2)
AM_GCONF_SOURCE_2 AM_GCONF_SOURCE_2
GLIB_GSETTINGS
dnl Check for bind in libsocket (needed on Solaris) dnl Check for bind in libsocket (needed on Solaris)
AC_CHECK_LIB(socket, bind) AC_CHECK_LIB(socket, bind)
...@@ -267,7 +269,7 @@ if test "x$ac_cv_header_ifaddrs_h" = "xyes"; then ...@@ -267,7 +269,7 @@ if test "x$ac_cv_header_ifaddrs_h" = "xyes"; then
fi fi
dnl active plugins for vinagre.schemas dnl active plugins for org.gnome.Vinagre.gschema.xml
ACTIVE_PLUGINS="vnc" ACTIVE_PLUGINS="vnc"
if test "x$enable_ssh" = "xyes" ; then if test "x$enable_ssh" = "xyes" ; then
ACTIVE_PLUGINS="$ACTIVE_PLUGINS,ssh" ACTIVE_PLUGINS="$ACTIVE_PLUGINS,ssh"
...@@ -303,7 +305,6 @@ data/Makefile ...@@ -303,7 +305,6 @@ data/Makefile
data/vinagre.desktop.in data/vinagre.desktop.in
data/vinagre-file.desktop.in data/vinagre-file.desktop.in
data/vinagre.pc data/vinagre.pc
data/vinagre.schemas.in
data/icons/Makefile data/icons/Makefile
help/Makefile help/Makefile
po/Makefile.in po/Makefile.in
......
/*.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
...@@ -21,26 +21,12 @@ MIMEFILES = vinagre-mime.xml.in ...@@ -21,26 +21,12 @@ MIMEFILES = vinagre-mime.xml.in
mimedir = $(datadir)/mime/packages mimedir = $(datadir)/mime/packages
mime_DATA = vinagre-mime.xml mime_DATA = vinagre-mime.xml
schemasdir = $(GCONF_SCHEMA_FILE_DIR) gsettings_SCHEMAS = org.gnome.Vinagre.gschema.xml
schemas_in_files = vinagre.schemas.in @GSETTINGS_RULES@
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 = \ CLEANFILES = \
$(desktop_DATA) \ $(desktop_DATA) \
$(mime_DATA) \ $(mime_DATA) \
$(schemas_DATA) \
$(pkgconfig_DATA) \ $(pkgconfig_DATA) \
org.freedesktop.Telepathy.Client.Vinagre.service org.freedesktop.Telepathy.Client.Vinagre.service
...@@ -50,9 +36,8 @@ EXTRA_DIST = \ ...@@ -50,9 +36,8 @@ EXTRA_DIST = \
$(ui_DATA) \ $(ui_DATA) \
$(desktop_in_files) \ $(desktop_in_files) \
$(MIMEFILES) \ $(MIMEFILES) \
$(schemas_in_files) \ $(gsettings_SCHEMAS) \
vinagre.pc.in \ vinagre.pc.in \
vinagre.schemas.in.in \
Vinagre.client \ Vinagre.client \
org.freedesktop.Telepathy.Client.Vinagre.service.in org.freedesktop.Telepathy.Client.Vinagre.service.in
......
<?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>
<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 %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>
<schema>
<key>/schemas/apps/vinagre/shared_flag</key>
<applyto>/apps/vinagre/shared_flag</applyto>
<owner>vinagre</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Whether we should leave other clients connected</short>
<long>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.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/vinagre/always_show_tabs</key>
<applyto>/apps/vinagre/always_show_tabs</applyto>
<owner>vinagre</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Whether we should show tabs even when there is only one active connection</short>
<long>Set to "true" to always show the tabs. Set to "false" to only show the tabs when there is more than one active connection.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/vinagre/show_accels</key>
<applyto>/apps/vinagre/show_accels</applyto>
<owner>vinagre</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Whether we should show the menu accelerators (shortcut keys)</short>
<long>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.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/vinagre/history_size</key>
<applyto>/apps/vinagre/history_size</applyto>
<owner>vinagre</owner>
<type>int</type>
<default>15</default>
<locale name="C">
<short>Maximum number of history items in connect dialog</short>
<long>Specifies the maximum number of items in the host dropdown entry.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/vinagre/plugins/active-plugins</key>
<applyto>/apps/vinagre/plugins/active-plugins</applyto>
<owner>vinagre</owner>
<type>list</type>
<list_type>string</list_type>
<default>[@ACTIVE_PLUGINS@]</default>
<locale name="C">
<short>Active plugins</short>
<long>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.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/vinagre/always_enable_listening</key>
<applyto>/apps/vinagre/always_enable_listening</applyto>
<owner>vinagre</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Whether we should start the program listening for reverse connections</short>
<long>Set to "true" to always start the program listening for reverse connections.</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>
...@@ -4,7 +4,6 @@ data/GNOME_VinagreApplet.xml ...@@ -4,7 +4,6 @@ data/GNOME_VinagreApplet.xml
data/vinagre.desktop.in.in data/vinagre.desktop.in.in
data/vinagre-file.desktop.in.in data/vinagre-file.desktop.in.in
[type: gettext/glade]data/vinagre.ui [type: gettext/glade]data/vinagre.ui
data/vinagre.schemas.in.in
data/vinagre-mime.xml.in data/vinagre-mime.xml.in
data/vinagre-ui.xml data/vinagre-ui.xml
plugins/rdp/rdp.plugin.desktop.in plugins/rdp/rdp.plugin.desktop.in
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment