Mercurial > pidgin
changeset 27287:f24a8b9d1be3
merge of '7f396ae5ae1a07562f3822bfdf32a5b71b737970'
and 'b5c22753df947a633375026b7e424152cb435539'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sat, 04 Jul 2009 07:54:50 +0000 |
| parents | 2a5c906e1104 (diff) 73c8e1964eef (current diff) |
| children | 9aea1eb8aa66 28fd0ca5c693 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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;