changeset
merge of '61d5134ee4287f4796ed69d6597225c1919bd2d0'
Mon, 03 Dec 2007 07:05:57 +0000
- author
- Richard Nelson <wabz@pidgin.im>
- date
- Mon, 03 Dec 2007 07:05:57 +0000
- changeset 21858
- 3cd092cc6ef9
- parent 21857
- 61d5134ee428 (current diff)
- parent 21854
- 8b23ec9540ba (diff)
- child 21859
- 5107469829ef
- child 21860
- 4b59d696baa1
- child 21861
- 387ab804779e
merge of '61d5134ee4287f4796ed69d6597225c1919bd2d0'
and '8b23ec9540ba9d567263a6c8e987d877ee3a42d5'
--- 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);
