Mercurial > pidgin
comparison libpurple/plugins/autoaccept.c @ 32739:bba25395d28e
*** 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.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 27 Feb 2012 23:08:37 +0000 |
parents | a8cc50c2279f |
children | 8404c5b75e99 |
comparison
equal
deleted
inserted
replaced
32738:fd4a16fdb7ae | 32739:bba25395d28e |
---|---|
236 * to clean up after ourselves, but we don't want to do it yet | 236 * to clean up after ourselves, but we don't want to do it yet |
237 * so that we don't break users who share a .purple directory | 237 * so that we don't break users who share a .purple directory |
238 * between old libpurple clients and new libpurple clients. | 238 * between old libpurple clients and new libpurple clients. |
239 * --Mark Doliner, 2011-01-03 | 239 * --Mark Doliner, 2011-01-03 |
240 */ | 240 */ |
241 if(purple_prefs_get_bool(PREF_STRANGER_OLD)) | 241 if (!purple_prefs_exists(PREF_STRANGER)) { |
242 purple_prefs_set_int(PREF_STRANGER, FT_REJECT); | 242 if (purple_prefs_get_bool(PREF_STRANGER_OLD)) |
243 purple_prefs_add_int(PREF_STRANGER, FT_REJECT); | |
244 else | |
245 purple_prefs_set_int(PREF_STRANGER, FT_ASK); | |
246 } | |
243 | 247 |
244 purple_signal_connect(purple_xfers_get_handle(), "file-recv-request", plugin, | 248 purple_signal_connect(purple_xfers_get_handle(), "file-recv-request", plugin, |
245 PURPLE_CALLBACK(file_recv_request_cb), plugin); | 249 PURPLE_CALLBACK(file_recv_request_cb), plugin); |
246 purple_signal_connect(purple_blist_get_handle(), "blist-node-extended-menu", plugin, | 250 purple_signal_connect(purple_blist_get_handle(), "blist-node-extended-menu", plugin, |
247 PURPLE_CALLBACK(context_menu), plugin); | 251 PURPLE_CALLBACK(context_menu), plugin); |
343 char *dirname; | 347 char *dirname; |
344 | 348 |
345 dirname = g_build_filename(purple_user_dir(), "autoaccept", NULL); | 349 dirname = g_build_filename(purple_user_dir(), "autoaccept", NULL); |
346 purple_prefs_add_none(PREF_PREFIX); | 350 purple_prefs_add_none(PREF_PREFIX); |
347 purple_prefs_add_string(PREF_PATH, dirname); | 351 purple_prefs_add_string(PREF_PATH, dirname); |
348 purple_prefs_add_int(PREF_STRANGER, FT_ASK); | |
349 purple_prefs_add_bool(PREF_NOTIFY, TRUE); | 352 purple_prefs_add_bool(PREF_NOTIFY, TRUE); |
350 purple_prefs_add_bool(PREF_NEWDIR, TRUE); | 353 purple_prefs_add_bool(PREF_NEWDIR, TRUE); |
351 purple_prefs_add_bool(PREF_ESCAPE, TRUE); | 354 purple_prefs_add_bool(PREF_ESCAPE, TRUE); |
352 g_free(dirname); | 355 g_free(dirname); |
353 } | 356 } |