changeset 29439:031fd1cd88df

jabber: Update the default FT proxy (if it's still set as the previous, broken, default).
author Paul Aurich <paul@darkrain42.org>
date Mon, 15 Feb 2010 00:20:55 +0000
parents 1c035c869344
children f0e80126a3ce f2949cd7db0a 2ad2e3490b23
files ChangeLog libpurple/protocols/jabber/jabber.c libpurple/protocols/jabber/jabber.h libpurple/protocols/jabber/libxmpp.c
diffstat 4 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Feb 15 00:12:12 2010 +0000
+++ b/ChangeLog	Mon Feb 15 00:20:55 2010 +0000
@@ -59,6 +59,9 @@
 	  disconnected by servers that dislike overly-large stanzas.
 	* Fix receiving messages without markup over an Openfire BOSH connection
 	  (forcibly put the stanzas in the jabber:client namespace).
+	* The default value for the file transfer proxies is automatically
+	  updated when an account connects, if it is still the old (broken)
+	  default (from 'proxy.jabber.org' to 'proxy.eu.jabber.org').
 
 	Yahoo:
 	* Don't send <span> and </span> tags.  (Fartash Faghri)
--- a/libpurple/protocols/jabber/jabber.c	Mon Feb 15 00:12:12 2010 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Mon Feb 15 00:20:55 2010 +0000
@@ -951,6 +951,10 @@
 	if (js == NULL)
 		return;
 
+	/* TODO: Remove this at some point.  Added 2010-02-14 (v2.6.6) */
+	if (g_str_equal("proxy.jabber.org", purple_account_get_string(account, "ft_proxies", "")))
+		purple_account_set_string(account, "ft_proxies", JABBER_DEFAULT_FT_PROXIES);
+
 	/*
 	 * Calculate the avatar hash for our current image so we know (when we
 	 * fetch our vCard and PEP avatar) if we should send our avatar to the
--- a/libpurple/protocols/jabber/jabber.h	Mon Feb 15 00:12:12 2010 +0000
+++ b/libpurple/protocols/jabber/jabber.h	Mon Feb 15 00:20:55 2010 +0000
@@ -81,6 +81,7 @@
 #define CAPS0115_NODE "http://pidgin.im/"
 
 #define JABBER_DEFAULT_REQUIRE_TLS    TRUE
+#define JABBER_DEFAULT_FT_PROXIES     "proxy.eu.jabber.org"
 
 /* Index into attention_types list */
 #define JABBER_BUZZ 0
--- a/libpurple/protocols/jabber/libxmpp.c	Mon Feb 15 00:12:12 2010 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Mon Feb 15 00:20:55 2010 +0000
@@ -383,7 +383,7 @@
 						  "ft_proxies",
 						/* TODO: Is this an acceptable default?
 						 * Also, keep this in sync as they add more servers */
-						  "proxy.eu.jabber.org");
+						  JABBER_DEFAULT_FT_PROXIES);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 						  option);