soc.2008.masterpassword: b70b7c7a: Prompt the user for a password if the ke...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: b70b7c7ac4e4413c69d89b4f560d85770185c208
Parent:   c004b0461d0ff27dbddf51d7a43033badb271920
Author:   qulogic at pidgin.im
Date:     11/20/11 04:23:16
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/b70b7c7ac4e4413c69d89b4f560d85770185c208

Changelog: 

Prompt the user for a password if the keyring's result is non-NULL,
but 0-length.

Changes against parent c004b0461d0ff27dbddf51d7a43033badb271920

  patched  libpurple/account.c

-------------- next part --------------
============================================================
--- libpurple/account.c	30c534dbcfd69e68d296c10139368e50c092b22f
+++ libpurple/account.c	f37ba2b62793dfc13dd52735804d2d613012028f
@@ -1299,7 +1299,7 @@ purple_account_connect_got_password_cb(P
 {
 	PurplePluginProtocolInfo *prpl_info = data;
 
-	if ((password == NULL) &&
+	if ((password == NULL || *password == '\0') &&
 		!(prpl_info->options & OPT_PROTO_NO_PASSWORD) &&
 		!(prpl_info->options & OPT_PROTO_PASSWORD_OPTIONAL))
 		purple_account_request_password(account, G_CALLBACK(request_password_ok_cb), G_CALLBACK(request_password_cancel_cb), account);