pidgin: 1d831e83: jabber: Update the default FT proxy (if ...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 1d831e835bac31debd4d67cc75397c378c00bc7e
Ancestor: 7d48379ec50d5f267e76d1b1ffa51498bf19529e
Author: darkrain42 at pidgin.im
Date: 2010-02-15T00:20:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1d831e835bac31debd4d67cc75397c378c00bc7e

Modified files:
        ChangeLog libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c

ChangeLog: 

jabber: Update the default FT proxy (if it's still set as the previous, broken, default).

-------------- next part --------------
============================================================
--- ChangeLog	5ed02c27c245c713e9616389860f07a50eb98e0c
+++ ChangeLog	fd2096a5f2d57472a4e893ae76083de77188027f
@@ -59,6 +59,9 @@ version 2.6.6 (??/??/20??):
 	  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)
============================================================
--- libpurple/protocols/jabber/jabber.c	139f9dcfa145014e3c7a95d92f71e9ca1fe13682
+++ libpurple/protocols/jabber/jabber.c	4a5b75caa1682742700e182ad5a68fff4fed172c
@@ -951,6 +951,10 @@ jabber_login(PurpleAccount *account)
 	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
============================================================
--- libpurple/protocols/jabber/jabber.h	75485219b30094f6a1dff07499d5433a539acb90
+++ libpurple/protocols/jabber/jabber.h	ecb6d7836f1d4b28d2919396859ca51a6842a931
@@ -81,6 +81,7 @@ typedef struct _JabberStream JabberStrea
 #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
============================================================
--- libpurple/protocols/jabber/libxmpp.c	6d1839e61483597c793d12d0efce7ad1c7fe7ae1
+++ libpurple/protocols/jabber/libxmpp.c	84e0faceeb152e3a506af9b6f96b15bf3bfb027b
@@ -383,7 +383,7 @@ init_plugin(PurplePlugin *plugin)
 						  "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);