diff -r 25c14927f826 -r c49f6e9ea27d libpurple/protocols/jabber/auth.c --- a/libpurple/protocols/jabber/auth.c Sat Aug 29 00:45:37 2009 +0000 +++ b/libpurple/protocols/jabber/auth.c Sat Aug 29 01:11:36 2009 +0000 @@ -168,7 +168,7 @@ static int jabber_sasl_cb_secret(sasl_conn_t *conn, void *ctx, int id, sasl_secret_t **secret) { JabberStream *js = (JabberStream *)ctx; - const char *pw = purple_account_get_password(js->gc->account); + const char *pw = purple_connection_get_password(js->gc); size_t len; static sasl_secret_t *x = NULL; @@ -320,7 +320,7 @@ * to get one */ - if (!purple_account_get_password(js->gc->account)) { + if (!purple_connection_get_password(js->gc)) { purple_account_request_password(js->gc->account, G_CALLBACK(auth_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc); return; @@ -457,7 +457,7 @@ js->sasl_cb[id].context = (void *)js; id++; - if (purple_account_get_password(js->gc->account) != NULL ) { + if (purple_connection_get_password(js->gc) != NULL ) { js->sasl_cb[id].id = SASL_CB_PASS; js->sasl_cb[id].proc = jabber_sasl_cb_secret; js->sasl_cb[id].context = (void *)js; @@ -710,7 +710,7 @@ * password prompting here */ - if (!purple_account_get_password(js->gc->account)) { + if (!purple_connection_get_password(js->gc)) { purple_account_request_password(js->gc->account, G_CALLBACK(auth_old_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc); return; }