# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1140551810 0
# Node ID f6f465b8d1c0b8e35c718ec6a7c3f683f7c377db
# Parent  10c26505d6dbaafe0e034aa7e957de8f5fd10e88
[gaim-migrate @ 15677]
Honor the 'use_rv_proxy' account option and remove the prpl prefs.

committer: Tailor Script <tailor@pidgin.im>

diff -r 10c26505d6db -r f6f465b8d1c0 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Tue Feb 21 19:55:55 2006 +0000
+++ b/src/protocols/oscar/oscar.c	Tue Feb 21 19:56:50 2006 +0000
@@ -2754,7 +2754,7 @@
 	const char *ip;
 	gboolean use_rv_proxy;
 
-	use_rv_proxy = gaim_prefs_get_bool("/plugins/prpl/oscar/use_rv_proxy");
+	use_rv_proxy = gaim_account_get_bool(gc->account, "use_rv_proxy", OSCAR_DEFAULT_USE_RV_PROXY);
 	if(use_rv_proxy)
 		gaim_debug_info("oscar","using stage 1 proxied transfer\n");
 
@@ -4230,7 +4230,7 @@
 			/* Build the file transfer handle */
 			xfer = gaim_xfer_new(gc->account, GAIM_XFER_RECEIVE, userinfo->sn);
 
-			use_rv_proxy = gaim_prefs_get_bool("/plugins/prpl/oscar/use_rv_proxy");
+			use_rv_proxy = gaim_account_get_bool(account, "use_rv_proxy", OSCAR_DEFAULT_USE_RV_PROXY);
 
 			if(args->info.sendfile.use_proxy) {
 				/* The sender requested (stage 1) that we use a rendezvous proxy */
@@ -8527,33 +8527,6 @@
 	}
 }
 
-static GaimPluginPrefFrame *
-get_plugin_pref_frame(GaimPlugin *plugin)
-{
-	GaimPluginPrefFrame *frame;
-	GaimPluginPref *ppref;
-
-	frame = gaim_plugin_pref_frame_new();
-
-#ifdef USE_PRPL_PREFERENCES
-	ppref = gaim_plugin_pref_new_with_name_and_label("/plugins/prpl/oscar/recent_buddies", _("Use recent buddies group"));
-	gaim_plugin_pref_frame_add(frame, ppref);
-
-	ppref = gaim_plugin_pref_new_with_name_and_label("/plugins/prpl/oscar/show_idle", _("Show how long you have been idle"));
-	gaim_plugin_pref_frame_add(frame, ppref);
-#endif
-
-	ppref = gaim_plugin_pref_new_with_label(_("File Transfers"));
-	gaim_plugin_pref_frame_add(frame, ppref);
-
-	ppref = gaim_plugin_pref_new_with_name_and_label(
-			    "/plugins/prpl/oscar/use_rv_proxy",
-			    _("Use AIM/ICQ proxy server (slower, but usually works)"));
-	gaim_plugin_pref_frame_add(frame, ppref);
-
-	return frame;
-}
-
 static const char *
 oscar_normalize(const GaimAccount *account, const char *str)
 {
@@ -8659,12 +8632,6 @@
 	NULL,					/* whiteboard_prpl_ops */
 };
 
-static GaimPluginUiInfo prefs_info = {
-	get_plugin_pref_frame,
-	0,   /* page_num (Reserved) */
-	NULL /* frame (Reserved) */
-};
-
 static GaimPluginInfo info =
 {
 	GAIM_PLUGIN_MAGIC,
@@ -8692,7 +8659,7 @@
 
 	NULL,                                             /**< ui_info        */
 	&prpl_info,                                       /**< extra_info     */
-	&prefs_info,
+	NULL,
 	oscar_actions
 };
 
@@ -8719,7 +8686,8 @@
 	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_add_bool("/plugins/prpl/oscar/use_rv_proxy", FALSE);
+
+	gaim_prefs_remove("/plugins/prpl/oscar/use_rv_proxy");
 }
 
 GAIM_INIT_PLUGIN(oscar, init_plugin, info);