# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1330384117 0
# Node ID bba25395d28ea8eb21fc636368ae02a9dc9a82f5
# Parent  fd4a16fdb7aef0e756bc68d61151f7d40cd85eae
*** Plucked rev 8102ace3c8e8bec9e456d927dd7c923afbb582a6 (qulogic@pidgin.im):
Don't migrate the old autoaccept pref if the new one already exists.
Otherwise, we would clobber the existing pref if it doesn't match
the old pref.

Fixes #14964.

diff -r fd4a16fdb7ae -r bba25395d28e ChangeLog
--- a/ChangeLog	Thu Feb 23 08:13:01 2012 +0000
+++ b/ChangeLog	Mon Feb 27 23:08:37 2012 +0000
@@ -31,6 +31,10 @@
 	Windows-Specific Changes:
 	* Fix compilation of the Bonjour protocol plugin. (#14802)
 
+	Plugins:
+	* The autoaccept plugin will no longer reset the preference for unknown
+	  buddies to "Auto Reject" in certain cases. (#14964)
+
 version 2.10.1 (12/06/2011):
 	Finch:
 	* Fix compilation on OpenBSD.
diff -r fd4a16fdb7ae -r bba25395d28e libpurple/plugins/autoaccept.c
--- a/libpurple/plugins/autoaccept.c	Thu Feb 23 08:13:01 2012 +0000
+++ b/libpurple/plugins/autoaccept.c	Mon Feb 27 23:08:37 2012 +0000
@@ -238,8 +238,12 @@
 	 *       between old libpurple clients and new libpurple clients.
 	 *                                             --Mark Doliner, 2011-01-03
 	 */
-	if(purple_prefs_get_bool(PREF_STRANGER_OLD))
-		purple_prefs_set_int(PREF_STRANGER, FT_REJECT);
+	if (!purple_prefs_exists(PREF_STRANGER)) {
+		if (purple_prefs_get_bool(PREF_STRANGER_OLD))
+			purple_prefs_add_int(PREF_STRANGER, FT_REJECT);
+		else
+			purple_prefs_set_int(PREF_STRANGER, FT_ASK);
+	}
 
 	purple_signal_connect(purple_xfers_get_handle(), "file-recv-request", plugin,
 						PURPLE_CALLBACK(file_recv_request_cb), plugin);
@@ -345,7 +349,6 @@
 	dirname = g_build_filename(purple_user_dir(), "autoaccept", NULL);
 	purple_prefs_add_none(PREF_PREFIX);
 	purple_prefs_add_string(PREF_PATH, dirname);
-	purple_prefs_add_int(PREF_STRANGER, FT_ASK);
 	purple_prefs_add_bool(PREF_NOTIFY, TRUE);
 	purple_prefs_add_bool(PREF_NEWDIR, TRUE);
 	purple_prefs_add_bool(PREF_ESCAPE, TRUE);