Mercurial > pidgin

changeset 21119:7a87450fdafe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Since the XMPP PurpleConnection is created before we know we need a password, after prompting for the password, the password is never set inside the PurpleConnection, only the PurpleAccount. Now if there's no password on the PurpleConnection, we look for one on the PurpleAccount. fixes #3552
author Nathan Walp <nwalp@pidgin.im>
date Sat, 03 Nov 2007 16:19:50 +0000
parents 2bc214520c42
children 0cc12e6909e2
files libpurple/connection.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/connection.c	Sat Nov 03 06:17:09 2007 +0000
+++ b/libpurple/connection.c	Sat Nov 03 16:19:50 2007 +0000
@@ -432,7 +432,7 @@
 {
 	g_return_val_if_fail(gc != NULL, NULL);
 
-	return gc->password;
+	return gc->password ? gc->password : gc->account->password;
 }
 
 const char *