# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1246694090 0
# Node ID f24a8b9d1be3d755825ac3d658d4580b616ff64c
# Parent  2a5c906e1104f61c508887fcf3cfcecba047a191# Parent  73c8e1964eef002fc1184a2ac365bce7973407b5
merge of '7f396ae5ae1a07562f3822bfdf32a5b71b737970'
     and 'b5c22753df947a633375026b7e424152cb435539'

diff -r 73c8e1964eef -r f24a8b9d1be3 doc/PERL-HOWTO.dox
--- a/doc/PERL-HOWTO.dox	Sat Jul 04 06:44:39 2009 +0000
+++ b/doc/PERL-HOWTO.dox	Sat Jul 04 07:54:50 2009 +0000
@@ -323,9 +323,10 @@
 sub plugin_load {
 	my $plugin = shift;
 
+	# This is necessary to create each level in the preferences tree.
+	Purple::Prefs::add_none("/plugins/core/perl_test");
 	# Here we are adding a set of preferences
 	#  The second argument is the default value for the preference.
-	Purple::Prefs::add_none("/plugins/core/perl_test");
 	Purple::Prefs::add_bool("/plugins/core/perl_test/bool", 1);
 	Purple::Prefs::add_string("/plugins/core/perl_test/choice_str", "ch1");
 	Purple::Prefs::add_int("/plugins/core/perl_test/choice_int", 1);
diff -r 73c8e1964eef -r f24a8b9d1be3 libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/yahoo.c	Sat Jul 04 06:44:39 2009 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Sat Jul 04 07:54:50 2009 +0000
@@ -1792,7 +1792,7 @@
 				case 1212:
 					/* Password incorrect */
 					/* Set password to NULL. Avoids account locking. Brings dialog to enter password if clicked on Re-enable account */
-					if (purple_account_get_remember_password(purple_connection_get_account(gc)))
+					if (!purple_account_get_remember_password(purple_connection_get_account(gc)))
 						purple_account_set_password(purple_connection_get_account(gc), NULL);
 					error_reason = g_strdup(_("Incorrect Password"));
 					error = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;