Mercurial > pidgin3 / changeset

--- a/configure.ac	Thu Sep 01 11:18:33 2016 -0500
+++ b/configure.ac	Thu Sep 01 20:54:34 2016 -0400
@@ -938,13 +938,6 @@
 AC_SUBST(ZLIB_LIBS)
 
 dnl #######################################################################
-dnl # GConf schemas
-dnl #######################################################################
-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-AM_CONDITIONAL(USE_GCONFTOOL, test "x$GCONFTOOL" != "xno")
-AM_GCONF_SOURCE_2
-
-dnl #######################################################################
 dnl # Check for GStreamer
 dnl #######################################################################
 AC_ARG_ENABLE(gstreamer,
@@ -2193,7 +2186,6 @@
 		   pidgin/themes/Makefile
 		   pidgin/win32/pidgin_dll_rc.rc
 		   pidgin/win32/pidgin_exe_rc.rc
-		   libpurple/data/gconf/Makefile
 		   libpurple/data/purple-url-handler.desktop.in
 		   libpurple/data/purple-3.pc
 		   libpurple/data/purple-3-uninstalled.pc

--- a/libpurple/Makefile.am	Thu Sep 01 11:18:33 2016 -0500
+++ b/libpurple/Makefile.am	Thu Sep 01 20:54:34 2016 -0400
@@ -30,11 +30,7 @@
 		win32/giowin32.c \
 		win32/win32dep.h
 
-if USE_GCONFTOOL
-GCONF_DIR=data/gconf
-endif
-
-SUBDIRS = $(GCONF_DIR) . plugins protocols tests example
+SUBDIRS = . plugins protocols tests example
 
 purple_coresources = \
 	account.c \

--- a/libpurple/data/gconf/Makefile.am	Thu Sep 01 11:18:33 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-schemadir = @GCONF_SCHEMA_FILE_DIR@
-
-EXTRA_DIST = purple.schemas.in
-
-if INSTALL_I18N
-schema_in_files = purple.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-
-# silenced INTLTOOL_SCHEMAS_RULE
-%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
-	$(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ > /dev/null
-
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	LANG=en GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \
-		grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2 || true
-else
-install-data-local:
-endif #GCONF_SCHEMAS_INSTALL
-
-DISTCLEANFILES= purple.schemas
-
-endif #INSTALL_I18N

--- a/libpurple/data/gconf/purple.schemas.in	Thu Sep 01 11:18:33 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,276 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/aim/enabled</key>
-      <applyto>/desktop/gnome/url-handlers/aim/enabled</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether the specified command should handle "aim" URLs</short>
-        <long>True if the command specified in the "command" key should handle "aim" URLs.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/aim/command</key>
-      <applyto>/desktop/gnome/url-handlers/aim/command</applyto>
-      <owner>purple</owner>
-      <type>string</type>
-      <default>purple-url-handler "%s"</default>
-      <locale name="C">
-        <short>The handler for "aim" URLs</short>
-        <long>The command used to handle "aim" URLs, if enabled.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/aim/needs_terminal</key>
-      <applyto>/desktop/gnome/url-handlers/aim/needs_terminal</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Run the command in a terminal</short>
-        <long>True if the command used to handle this type of URL should be run in a terminal.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/gg/enabled</key>
-      <applyto>/desktop/gnome/url-handlers/gg/enabled</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether the specified command should handle "gg" URLs</short>
-        <long>True if the command specified in the "command" key should handle "gg" URLs.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/gg/command</key>
-      <applyto>/desktop/gnome/url-handlers/gg/command</applyto>
-      <owner>purple</owner>
-      <type>string</type>
-      <default>purple-url-handler "%s"</default>
-      <locale name="C">
-        <short>The handler for "gg" URLs</short>
-        <long>The command used to handle "gg" URLs, if enabled.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/gg/needs_terminal</key>
-      <applyto>/desktop/gnome/url-handlers/gg/needs_terminal</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Run the command in a terminal</short>
-        <long>True if the command used to handle this type of URL should be run in a terminal.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/icq/enabled</key>
-      <applyto>/desktop/gnome/url-handlers/icq/enabled</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether the specified command should handle "icq" URLs</short>
-        <long>True if the command specified in the "command" key should handle "icq" URLs.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/icq/command</key>
-      <applyto>/desktop/gnome/url-handlers/icq/command</applyto>
-      <owner>purple</owner>
-      <type>string</type>
-      <default>purple-url-handler "%s"</default>
-      <locale name="C">
-        <short>The handler for "icq" URLs</short>
-        <long>The command used to handle "icq" URLs, if enabled.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/icq/needs_terminal</key>
-      <applyto>/desktop/gnome/url-handlers/icq/needs_terminal</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Run the command in a terminal</short>
-        <long>True if the command used to handle this type of URL should be run in a terminal.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/irc/enabled</key>
-      <applyto>/desktop/gnome/url-handlers/irc/enabled</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether the specified command should handle "irc" URLs</short>
-        <long>True if the command specified in the "command" key should handle "irc" URLs.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/irc/command</key>
-      <applyto>/desktop/gnome/url-handlers/irc/command</applyto>
-      <owner>purple</owner>
-      <type>string</type>
-      <default>purple-url-handler "%s"</default>
-      <locale name="C">
-        <short>The handler for "irc" URLs</short>
-        <long>The command used to handle "irc" URLs, if enabled.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/irc/needs_terminal</key>
-      <applyto>/desktop/gnome/url-handlers/irc/needs_terminal</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Run the command in a terminal</short>
-        <long>True if the command used to handle this type of URL should be run in a terminal.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/msnim/enabled</key>
-      <applyto>/desktop/gnome/url-handlers/msnim/enabled</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether the specified command should handle "msnim" URLs</short>
-        <long>True if the command specified in the "command" key should handle "msnim" URLs.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/msnim/command</key>
-      <applyto>/desktop/gnome/url-handlers/msnim/command</applyto>
-      <owner>purple</owner>
-      <type>string</type>
-      <default>purple-url-handler "%s"</default>
-      <locale name="C">
-        <short>The handler for "msnim" URLs</short>
-        <long>The command used to handle "msnim" URLs, if enabled.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/msnim/needs_terminal</key>
-      <applyto>/desktop/gnome/url-handlers/msnim/needs_terminal</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Run the command in a terminal</short>
-        <long>True if the command used to handle this type of URL should be run in a terminal.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/sip/enabled</key>
-      <applyto>/desktop/gnome/url-handlers/sip/enabled</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether the specified command should handle "sip" URLs</short>
-        <long>True if the command specified in the "command" key should handle "sip" URLs.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/sip/command</key>
-      <applyto>/desktop/gnome/url-handlers/sip/command</applyto>
-      <owner>purple</owner>
-      <type>string</type>
-      <default>purple-url-handler "%s"</default>
-      <locale name="C">
-        <short>The handler for "sip" URLs</short>
-        <long>The command used to handle "sip" URLs, if enabled.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/sip/needs_terminal</key>
-      <applyto>/desktop/gnome/url-handlers/sip/needs_terminal</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Run the command in a terminal</short>
-        <long>True if the command used to handle this type of URL should be run in a terminal.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/xmpp/enabled</key>
-      <applyto>/desktop/gnome/url-handlers/xmpp/enabled</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether the specified command should handle "xmpp" URLs</short>
-        <long>True if the command specified in the "command" key should handle "xmpp" URLs.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/xmpp/command</key>
-      <applyto>/desktop/gnome/url-handlers/xmpp/command</applyto>
-      <owner>purple</owner>
-      <type>string</type>
-      <default>purple-url-handler "%s"</default>
-      <locale name="C">
-        <short>The handler for "xmpp" URLs</short>
-        <long>The command used to handle "xmpp" URLs, if enabled.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/xmpp/needs_terminal</key>
-      <applyto>/desktop/gnome/url-handlers/xmpp/needs_terminal</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Run the command in a terminal</short>
-        <long>True if the command used to handle this type of URL should be run in a terminal.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/ymsgr/enabled</key>
-      <applyto>/desktop/gnome/url-handlers/ymsgr/enabled</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether the specified command should handle "ymsgr" URLs</short>
-        <long>True if the command specified in the "command" key should handle "ymsgr" URLs.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/ymsgr/command</key>
-      <applyto>/desktop/gnome/url-handlers/ymsgr/command</applyto>
-      <owner>purple</owner>
-      <type>string</type>
-      <default>purple-url-handler "%s"</default>
-      <locale name="C">
-        <short>The handler for "ymsgr" URLs</short>
-        <long>The command used to handle "ymsgr" URLs, if enabled.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/ymsgr/needs_terminal</key>
-      <applyto>/desktop/gnome/url-handlers/ymsgr/needs_terminal</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Run the command in a terminal</short>
-        <long>True if the command used to handle this type of URL should be run in a terminal.</long>
-      </locale>
-    </schema>
-  </schemalist>
-</gconfschemafile>