Mercurial > pidgin
comparison libpurple/protocols/jabber/auth.c @ 17012:b713af8ae274
I changed my mind, this should display the whole account name
author | Nathan Walp <nwalp@pidgin.im> |
---|---|
date | Fri, 11 May 2007 00:33:05 +0000 |
parents | 5f557e708335 |
children | 97a98ceb5c06 61c5d8737f01 |
comparison
equal
deleted
inserted
replaced
17011:e44a272b27a8 | 17012:b713af8ae274 |
---|---|
290 * it in plaintext, see if we can turn on | 290 * it in plaintext, see if we can turn on |
291 * plaintext auth | 291 * plaintext auth |
292 */ | 292 */ |
293 } else if (!plaintext) { | 293 } else if (!plaintext) { |
294 char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"), | 294 char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"), |
295 js->user->domain); | 295 js->gc->account->username); |
296 purple_request_yes_no(js->gc, _("Plaintext Authentication"), | 296 purple_request_yes_no(js->gc, _("Plaintext Authentication"), |
297 _("Plaintext Authentication"), | 297 _("Plaintext Authentication"), |
298 msg, | 298 msg, |
299 2, js->gc->account, NULL, NULL, NULL, | 299 2, js->gc->account, NULL, NULL, NULL, |
300 allow_cyrus_plaintext_auth, | 300 allow_cyrus_plaintext_auth, |
479 } else if(plain) { | 479 } else if(plain) { |
480 js->auth_type = JABBER_AUTH_PLAIN; | 480 js->auth_type = JABBER_AUTH_PLAIN; |
481 | 481 |
482 if(js->gsc == NULL && !purple_account_get_bool(js->gc->account, "auth_plain_in_clear", FALSE)) { | 482 if(js->gsc == NULL && !purple_account_get_bool(js->gc->account, "auth_plain_in_clear", FALSE)) { |
483 char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"), | 483 char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"), |
484 js->user->domain); | 484 js->gc->account->username); |
485 purple_request_yes_no(js->gc, _("Plaintext Authentication"), | 485 purple_request_yes_no(js->gc, _("Plaintext Authentication"), |
486 _("Plaintext Authentication"), | 486 _("Plaintext Authentication"), |
487 msg, | 487 msg, |
488 2, | 488 2, |
489 purple_connection_get_account(js->gc), NULL, NULL, | 489 purple_connection_get_account(js->gc), NULL, NULL, |