pidgin.2.x.y: 6807c4c5: *** Plucked rev 8102ace3c8e8bec9e456d927...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 6807c4c5a28536e02d64363122b925c53fb03f34
Parent:   82a49ad6cb19dd94f948bcac07d4a1d48b7f0e18
Author:   qulogic at pidgin.im
Date:     02/27/12 18:08:37
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/6807c4c5a28536e02d64363122b925c53fb03f34

Changelog: 

*** Plucked rev 8102ace3c8e8bec9e456d927dd7c923afbb582a6 (qulogic at 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.

Changes against parent 82a49ad6cb19dd94f948bcac07d4a1d48b7f0e18

  patched  ChangeLog
  patched  libpurple/plugins/autoaccept.c

-------------- next part --------------
============================================================
--- ChangeLog	4bedae90982ad07aeb2c5da0ddeb60ed71d93118
+++ ChangeLog	23aace224ee6695ea8b535eed5b9cb7c2cd222d8
@@ -31,6 +31,10 @@ version 2.10.2 (02/22/2012):
 	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.
============================================================
--- libpurple/plugins/autoaccept.c	a6540b7a7d2f48c141737052911b01b5e275b303
+++ libpurple/plugins/autoaccept.c	53628f4ebd1ab8a9bb233705d3fa4c41fb6b5932
@@ -238,8 +238,12 @@ plugin_load(PurplePlugin *plugin)
 	 *       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 @@ init_plugin(PurplePlugin *plugin) {
 	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);