/pidgin/main: bf06ecd3547b: Merged in qulogic/pidgin (pull reque...
Gary Kramlich <[email protected]> Tue, 06 Sep 2016 11:19:22 -0400
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: bf06ecd3547b248e6883ff24d04e62317d67d155 Author: Gary Kramlich <[email protected]> Date: 2016-09-06 10:15 -0500 Branch: default URL: https://hg.pidgin.im/pidgin/main/rev/bf06ecd3547b Description: Merged in qulogic/pidgin (pull request #116) Remove gconf schemas. diffstat: .hgignore | 1 - configure.ac | 8 - doc/reference/libpurple/Makefile.am | 1 - libpurple/Makefile.am | 6 +- libpurple/data/gconf/Makefile.am | 23 -- libpurple/data/gconf/purple.schemas.in | 276 ------------------------ libpurple/data/purple-url-handler.desktop.in.in | 2 +- 7 files changed, 2 insertions(+), 315 deletions(-) diffs (truncated from 382 to 300 lines): diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -77,7 +77,6 @@ libpurple/dbus-signals.c libpurple/dbus-types.[ch] libpurple/enums.[ch] libpurple/example/nullclient -libpurple/data/gconf/purple.schemas$ libpurple/data/purple-url-handler.desktop$ libpurple/data/purple-url-handler.desktop.in$ libpurple/marshallers.[ch] diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -938,13 +938,6 @@ AC_SUBST(ZLIB_CFLAGS) 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 @@ AC_CONFIG_FILES([Makefile 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 diff --git a/doc/reference/libpurple/Makefile.am b/doc/reference/libpurple/Makefile.am --- a/doc/reference/libpurple/Makefile.am +++ b/doc/reference/libpurple/Makefile.am @@ -66,7 +66,6 @@ EXTRA_HFILES = \ # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code IGNORE_HFILES=\ example \ - gconf \ plugins \ protocols \ tests \ diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am --- a/libpurple/Makefile.am +++ b/libpurple/Makefile.am @@ -30,11 +30,7 @@ EXTRA_DIST = \ 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 \ diff --git a/libpurple/data/gconf/Makefile.am b/libpurple/data/gconf/Makefile.am deleted file mode 100644 --- a/libpurple/data/gconf/Makefile.am +++ /dev/null @@ -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 diff --git a/libpurple/data/gconf/purple.schemas.in b/libpurple/data/gconf/purple.schemas.in deleted file mode 100644 --- a/libpurple/data/gconf/purple.schemas.in +++ /dev/null @@ -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> _______________________________________________ Commits mailing list [email protected] https://pidgin.im/cgi-bin/mailman/listinfo/commits