[Gaim-commits] SF.net SVN: gaim: [16074] trunk/src/protocols/oscar

[<the...@us...>]

Revision: 16074
Author:   thekingant
Date:     2006-04-20 19:48:58 -0700 (Thu, 20 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16074&view=rev

Log Message:
-----------
Change the name of the oscar account preference for "always use proxy
server for peer connections."  The description and meaning of this
preference has changed between 1.5.0 and 2.0.0.  It almost has the
inverse meaning of what it used to have.  Also, the default changed
from TRUE to FALSE, and I want to reset people's value to the default.

Modified Paths:
--------------
    trunk/src/protocols/oscar/oscar.c
    trunk/src/protocols/oscar/peer.c
Modified: trunk/src/protocols/oscar/oscar.c
===================================================================
--- trunk/src/protocols/oscar/oscar.c	2006-04-20 05:51:37 UTC (rev 16073)
+++ trunk/src/protocols/oscar/oscar.c	2006-04-21 02:48:58 UTC (rev 16074)
@@ -66,7 +66,7 @@
 #define OSCAR_DEFAULT_AUTHORIZATION TRUE
 #define OSCAR_DEFAULT_HIDE_IP TRUE
 #define OSCAR_DEFAULT_WEB_AWARE FALSE
-#define OSCAR_DEFAULT_USE_RV_PROXY FALSE
+#define OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY FALSE
 
 static int caps_aim = OSCAR_CAPABILITY_CHAT | OSCAR_CAPABILITY_BUDDYICON | OSCAR_CAPABILITY_DIRECTIM | OSCAR_CAPABILITY_SENDFILE | OSCAR_CAPABILITY_INTEROPERATE | OSCAR_CAPABILITY_ICHAT;
 static int caps_icq = OSCAR_CAPABILITY_BUDDYICON | OSCAR_CAPABILITY_DIRECTIM | OSCAR_CAPABILITY_SENDFILE | OSCAR_CAPABILITY_ICQUTF8 | OSCAR_CAPABILITY_INTEROPERATE | OSCAR_CAPABILITY_ICHAT;
@@ -6459,17 +6459,16 @@
 	option = gaim_account_option_string_new(_("Encoding"), "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	/* TODO: Need to somehow invert this */
 	option = gaim_account_option_bool_new(
-		_("Always use AIM/ICQ proxy server\n(slower, but does not reveal your IP address)"), "use_rv_proxy",
-		OSCAR_DEFAULT_USE_RV_PROXY);
+		_("Always use AIM/ICQ proxy server\n(slower, but 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);
 
 	/* Preferences */
 	gaim_prefs_add_none("/plugins/prpl/oscar");
 	gaim_prefs_add_bool("/plugins/prpl/oscar/recent_buddies", FALSE);
 	gaim_prefs_add_bool("/plugins/prpl/oscar/show_idle", FALSE);
-	gaim_prefs_remove("/plugins/prpl/oscar/use_rv_proxy");
+	gaim_prefs_remove("/plugins/prpl/oscar/always_use_rv_proxy");
 }
 
 GAIM_INIT_PLUGIN(oscar, init_plugin, info);

Modified: trunk/src/protocols/oscar/peer.c
===================================================================
--- trunk/src/protocols/oscar/peer.c	2006-04-20 05:51:37 UTC (rev 16073)
+++ trunk/src/protocols/oscar/peer.c	2006-04-21 02:48:58 UTC (rev 16074)
@@ -119,7 +119,7 @@
 	conn->listenerfd = -1;
 	conn->fd = -1;
 	conn->lastactivity = time(NULL);
-	conn->use_proxy |= gaim_account_get_bool(account, "use_rv_proxy", FALSE);
+	conn->use_proxy |= gaim_account_get_bool(account, "always_use_rv_proxy", FALSE);
 
 	if (type == OSCAR_CAPABILITY_DIRECTIM)
 		memcpy(conn->magic, "ODC2", 4);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.