# HG changeset patch # User Mark Doliner # Date 1174798303 0 # Node ID 88d626a179a6bf61f1e59ec193b86753c891e665 # Parent 0592a7b4db86ff0e313a5af4fffcb0f905351839 Rename our schemas file and update the url handler to point to the correct executable diff -r 0592a7b4db86 -r 88d626a179a6 Makefile.am --- a/Makefile.am Sun Mar 25 03:30:58 2007 +0000 +++ b/Makefile.am Sun Mar 25 04:51:43 2007 +0000 @@ -66,7 +66,7 @@ distuninstallcheck_listfiles = \ find . -type f -print | grep -v perl | grep -v Purple.3pm -DISTCLEANFILES= pidgin.desktop libpurple/gconf/gaim.schemas intltool-extract \ +DISTCLEANFILES= pidgin.desktop libpurple/gconf/purple.schemas intltool-extract \ intltool-merge intltool-update ACLOCAL_AMFLAGS = -I m4 diff -r 0592a7b4db86 -r 88d626a179a6 libpurple/gconf/Makefile.am --- a/libpurple/gconf/Makefile.am Sun Mar 25 03:30:58 2007 +0000 +++ b/libpurple/gconf/Makefile.am Sun Mar 25 04:51:43 2007 +0000 @@ -1,8 +1,8 @@ schemadir = @GCONF_SCHEMA_FILE_DIR@ -EXTRA_DIST = gaim.schemas.in +EXTRA_DIST = purple.schemas.in -schema_in_files = gaim.schemas.in +schema_in_files = purple.schemas.in schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ diff -r 0592a7b4db86 -r 88d626a179a6 libpurple/gconf/gaim.schemas.in --- a/libpurple/gconf/gaim.schemas.in Sun Mar 25 03:30:58 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,276 +0,0 @@ - - - - - /schemas/desktop/gnome/url-handlers/aim/enabled - /desktop/gnome/url-handlers/aim/enabled - gaim - bool - true - - Whether the specified command should handle "aim" URLs - True if the command specified in the "command" key should handle "aim" URLs. - - - - /schemas/desktop/gnome/url-handlers/aim/command - /desktop/gnome/url-handlers/aim/command - gaim - string - pidgin-url-handler "%s" - - The handler for "aim" URLs - The command used to handle "aim" URLs, if enabled. - - - - /schemas/desktop/gnome/url-handlers/aim/needs_terminal - /desktop/gnome/url-handlers/aim/needs_terminal - gaim - bool - false - - Run the command in a terminal - True if the command used to handle this type of URL should be run in a terminal. - - - - - /schemas/desktop/gnome/url-handlers/gg/enabled - /desktop/gnome/url-handlers/gg/enabled - gaim - bool - true - - Whether the specified command should handle "gg" URLs - True if the command specified in the "command" key should handle "gg" URLs. - - - - /schemas/desktop/gnome/url-handlers/gg/command - /desktop/gnome/url-handlers/gg/command - gaim - string - pidgin-url-handler "%s" - - The handler for "gg" URLs - The command used to handle "gg" URLs, if enabled. - - - - /schemas/desktop/gnome/url-handlers/gg/needs_terminal - /desktop/gnome/url-handlers/gg/needs_terminal - gaim - bool - false - - Run the command in a terminal - True if the command used to handle this type of URL should be run in a terminal. - - - - - /schemas/desktop/gnome/url-handlers/icq/enabled - /desktop/gnome/url-handlers/icq/enabled - gaim - bool - true - - Whether the specified command should handle "icq" URLs - True if the command specified in the "command" key should handle "icq" URLs. - - - - /schemas/desktop/gnome/url-handlers/icq/command - /desktop/gnome/url-handlers/icq/command - gaim - string - pidgin-url-handler "%s" - - The handler for "icq" URLs - The command used to handle "icq" URLs, if enabled. - - - - /schemas/desktop/gnome/url-handlers/icq/needs_terminal - /desktop/gnome/url-handlers/icq/needs_terminal - gaim - bool - false - - Run the command in a terminal - True if the command used to handle this type of URL should be run in a terminal. - - - - - /schemas/desktop/gnome/url-handlers/irc/enabled - /desktop/gnome/url-handlers/irc/enabled - gaim - bool - true - - Whether the specified command should handle "irc" URLs - True if the command specified in the "command" key should handle "irc" URLs. - - - - /schemas/desktop/gnome/url-handlers/irc/command - /desktop/gnome/url-handlers/irc/command - gaim - string - pidgin-url-handler "%s" - - The handler for "irc" URLs - The command used to handle "irc" URLs, if enabled. - - - - /schemas/desktop/gnome/url-handlers/irc/needs_terminal - /desktop/gnome/url-handlers/irc/needs_terminal - gaim - bool - false - - Run the command in a terminal - True if the command used to handle this type of URL should be run in a terminal. - - - - - /schemas/desktop/gnome/url-handlers/msnim/enabled - /desktop/gnome/url-handlers/msnim/enabled - gaim - bool - true - - Whether the specified command should handle "msnim" URLs - True if the command specified in the "command" key should handle "msnim" URLs. - - - - /schemas/desktop/gnome/url-handlers/msnim/command - /desktop/gnome/url-handlers/msnim/command - gaim - string - pidgin-url-handler "%s" - - The handler for "msnim" URLs - The command used to handle "msnim" URLs, if enabled. - - - - /schemas/desktop/gnome/url-handlers/msnim/needs_terminal - /desktop/gnome/url-handlers/msnim/needs_terminal - gaim - bool - false - - Run the command in a terminal - True if the command used to handle this type of URL should be run in a terminal. - - - - - /schemas/desktop/gnome/url-handlers/sip/enabled - /desktop/gnome/url-handlers/sip/enabled - gaim - bool - true - - Whether the specified command should handle "sip" URLs - True if the command specified in the "command" key should handle "sip" URLs. - - - - /schemas/desktop/gnome/url-handlers/sip/command - /desktop/gnome/url-handlers/sip/command - gaim - string - pidgin-url-handler "%s" - - The handler for "sip" URLs - The command used to handle "sip" URLs, if enabled. - - - - /schemas/desktop/gnome/url-handlers/sip/needs_terminal - /desktop/gnome/url-handlers/sip/needs_terminal - gaim - bool - false - - Run the command in a terminal - True if the command used to handle this type of URL should be run in a terminal. - - - - - /schemas/desktop/gnome/url-handlers/xmpp/enabled - /desktop/gnome/url-handlers/xmpp/enabled - gaim - bool - true - - Whether the specified command should handle "xmpp" URLs - True if the command specified in the "command" key should handle "xmpp" URLs. - - - - /schemas/desktop/gnome/url-handlers/xmpp/command - /desktop/gnome/url-handlers/xmpp/command - gaim - string - pidgin-url-handler "%s" - - The handler for "xmpp" URLs - The command used to handle "xmpp" URLs, if enabled. - - - - /schemas/desktop/gnome/url-handlers/xmpp/needs_terminal - /desktop/gnome/url-handlers/xmpp/needs_terminal - gaim - bool - false - - Run the command in a terminal - True if the command used to handle this type of URL should be run in a terminal. - - - - - /schemas/desktop/gnome/url-handlers/ymsgr/enabled - /desktop/gnome/url-handlers/ymsgr/enabled - gaim - bool - true - - Whether the specified command should handle "ymsgr" URLs - True if the command specified in the "command" key should handle "ymsgr" URLs. - - - - /schemas/desktop/gnome/url-handlers/ymsgr/command - /desktop/gnome/url-handlers/ymsgr/command - gaim - string - pidgin-url-handler "%s" - - The handler for "ymsgr" URLs - The command used to handle "ymsgr" URLs, if enabled. - - - - /schemas/desktop/gnome/url-handlers/ymsgr/needs_terminal - /desktop/gnome/url-handlers/ymsgr/needs_terminal - gaim - bool - false - - Run the command in a terminal - True if the command used to handle this type of URL should be run in a terminal. - - - - diff -r 0592a7b4db86 -r 88d626a179a6 libpurple/gconf/purple.schemas.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/gconf/purple.schemas.in Sun Mar 25 04:51:43 2007 +0000 @@ -0,0 +1,276 @@ + + + + + /schemas/desktop/gnome/url-handlers/aim/enabled + /desktop/gnome/url-handlers/aim/enabled + purple + bool + true + + Whether the specified command should handle "aim" URLs + True if the command specified in the "command" key should handle "aim" URLs. + + + + /schemas/desktop/gnome/url-handlers/aim/command + /desktop/gnome/url-handlers/aim/command + purple + string + purple-url-handler "%s" + + The handler for "aim" URLs + The command used to handle "aim" URLs, if enabled. + + + + /schemas/desktop/gnome/url-handlers/aim/needs_terminal + /desktop/gnome/url-handlers/aim/needs_terminal + purple + bool + false + + Run the command in a terminal + True if the command used to handle this type of URL should be run in a terminal. + + + + + /schemas/desktop/gnome/url-handlers/gg/enabled + /desktop/gnome/url-handlers/gg/enabled + purple + bool + true + + Whether the specified command should handle "gg" URLs + True if the command specified in the "command" key should handle "gg" URLs. + + + + /schemas/desktop/gnome/url-handlers/gg/command + /desktop/gnome/url-handlers/gg/command + purple + string + purple-url-handler "%s" + + The handler for "gg" URLs + The command used to handle "gg" URLs, if enabled. + + + + /schemas/desktop/gnome/url-handlers/gg/needs_terminal + /desktop/gnome/url-handlers/gg/needs_terminal + purple + bool + false + + Run the command in a terminal + True if the command used to handle this type of URL should be run in a terminal. + + + + + /schemas/desktop/gnome/url-handlers/icq/enabled + /desktop/gnome/url-handlers/icq/enabled + purple + bool + true + + Whether the specified command should handle "icq" URLs + True if the command specified in the "command" key should handle "icq" URLs. + + + + /schemas/desktop/gnome/url-handlers/icq/command + /desktop/gnome/url-handlers/icq/command + purple + string + purple-url-handler "%s" + + The handler for "icq" URLs + The command used to handle "icq" URLs, if enabled. + + + + /schemas/desktop/gnome/url-handlers/icq/needs_terminal + /desktop/gnome/url-handlers/icq/needs_terminal + purple + bool + false + + Run the command in a terminal + True if the command used to handle this type of URL should be run in a terminal. + + + + + /schemas/desktop/gnome/url-handlers/irc/enabled + /desktop/gnome/url-handlers/irc/enabled + purple + bool + true + + Whether the specified command should handle "irc" URLs + True if the command specified in the "command" key should handle "irc" URLs. + + + + /schemas/desktop/gnome/url-handlers/irc/command + /desktop/gnome/url-handlers/irc/command + purple + string + purple-url-handler "%s" + + The handler for "irc" URLs + The command used to handle "irc" URLs, if enabled. + + + + /schemas/desktop/gnome/url-handlers/irc/needs_terminal + /desktop/gnome/url-handlers/irc/needs_terminal + purple + bool + false + + Run the command in a terminal + True if the command used to handle this type of URL should be run in a terminal. + + + + + /schemas/desktop/gnome/url-handlers/msnim/enabled + /desktop/gnome/url-handlers/msnim/enabled + purple + bool + true + + Whether the specified command should handle "msnim" URLs + True if the command specified in the "command" key should handle "msnim" URLs. + + + + /schemas/desktop/gnome/url-handlers/msnim/command + /desktop/gnome/url-handlers/msnim/command + purple + string + purple-url-handler "%s" + + The handler for "msnim" URLs + The command used to handle "msnim" URLs, if enabled. + + + + /schemas/desktop/gnome/url-handlers/msnim/needs_terminal + /desktop/gnome/url-handlers/msnim/needs_terminal + purple + bool + false + + Run the command in a terminal + True if the command used to handle this type of URL should be run in a terminal. + + + + + /schemas/desktop/gnome/url-handlers/sip/enabled + /desktop/gnome/url-handlers/sip/enabled + purple + bool + true + + Whether the specified command should handle "sip" URLs + True if the command specified in the "command" key should handle "sip" URLs. + + + + /schemas/desktop/gnome/url-handlers/sip/command + /desktop/gnome/url-handlers/sip/command + purple + string + purple-url-handler "%s" + + The handler for "sip" URLs + The command used to handle "sip" URLs, if enabled. + + + + /schemas/desktop/gnome/url-handlers/sip/needs_terminal + /desktop/gnome/url-handlers/sip/needs_terminal + purple + bool + false + + Run the command in a terminal + True if the command used to handle this type of URL should be run in a terminal. + + + + + /schemas/desktop/gnome/url-handlers/xmpp/enabled + /desktop/gnome/url-handlers/xmpp/enabled + purple + bool + true + + Whether the specified command should handle "xmpp" URLs + True if the command specified in the "command" key should handle "xmpp" URLs. + + + + /schemas/desktop/gnome/url-handlers/xmpp/command + /desktop/gnome/url-handlers/xmpp/command + purple + string + purple-url-handler "%s" + + The handler for "xmpp" URLs + The command used to handle "xmpp" URLs, if enabled. + + + + /schemas/desktop/gnome/url-handlers/xmpp/needs_terminal + /desktop/gnome/url-handlers/xmpp/needs_terminal + purple + bool + false + + Run the command in a terminal + True if the command used to handle this type of URL should be run in a terminal. + + + + + /schemas/desktop/gnome/url-handlers/ymsgr/enabled + /desktop/gnome/url-handlers/ymsgr/enabled + purple + bool + true + + Whether the specified command should handle "ymsgr" URLs + True if the command specified in the "command" key should handle "ymsgr" URLs. + + + + /schemas/desktop/gnome/url-handlers/ymsgr/command + /desktop/gnome/url-handlers/ymsgr/command + purple + string + purple-url-handler "%s" + + The handler for "ymsgr" URLs + The command used to handle "ymsgr" URLs, if enabled. + + + + /schemas/desktop/gnome/url-handlers/ymsgr/needs_terminal + /desktop/gnome/url-handlers/ymsgr/needs_terminal + purple + bool + false + + Run the command in a terminal + True if the command used to handle this type of URL should be run in a terminal. + + + + diff -r 0592a7b4db86 -r 88d626a179a6 po/POTFILES.in --- a/po/POTFILES.in Sun Mar 25 03:30:58 2007 +0000 +++ b/po/POTFILES.in Sun Mar 25 04:51:43 2007 +0000 @@ -38,7 +38,7 @@ libpurple/desktopitem.c libpurple/dnsquery.c libpurple/ft.c -libpurple/gconf/gaim.schemas.in +libpurple/gconf/purple.schemas.in libpurple/log.c libpurple/plugin.c libpurple/plugins/autoaccept.c