# HG changeset patch
# User Richard Nelson <wabz@pidgin.im>
# Date 1196665557 0
# Node ID 34787c0d841c4b78fd1929a67d5e1ed00f2a3425
# Parent  ae95a171444280511152f3f55198d3d9cf3520e2# Parent  80aaf91b10250b01d382104deb5e36b213287b01
merge of '91693085a71d31037a9bbe0743802ed307b3ece4'
     and 'c62c3c810cef3a653af3b2eb3049b3b93d662e8a'

diff -r ae95a1714442 -r 34787c0d841c libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Mon Dec 03 07:02:48 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Mon Dec 03 07:05:57 2007 +0000
@@ -5335,6 +5335,7 @@
 
 	if (chat_name != NULL)
 		g_hash_table_insert(defaults, "room", g_strdup(chat_name));
+	g_hash_table_insert(defaults, "exchange", g_strdup("4"));
 
 	return defaults;
 }
@@ -6699,7 +6700,7 @@
 	prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);
 
 	option = purple_account_option_bool_new(
-		_("Always use ICQ proxy server for file transfers\n(slower, but does not reveal your IP address)"), "always_use_rv_proxy",
+		_("Always use AIM/ICQ proxy server for\nfile transfers and direct IM (slower,\nbut does not reveal your IP address)"), "always_use_rv_proxy",
 		OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY);
 	prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);