Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/auth.c @ 21099:51cf02dbdb0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disapproval of revision 'c484d979c4fda4433a9633ff8b69bd8a395c9479'
author Richard Laager <rlaager@wiktel.com>
date Fri, 16 Nov 2007 23:30:03 +0000
parents cab348e39751
children fcb848b2d669
comparison
equal deleted inserted replaced
21095:cab348e39751 21099:51cf02dbdb0e
316 * plaintext auth 316 * plaintext auth
317 */ 317 */
318 } else if (!plaintext) { 318 } else if (!plaintext) {
319 char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"), 319 char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"),
320 js->gc->account->username); 320 js->gc->account->username);
321 purple_request_yes_no_with_hint(js->gc, _("Plaintext Authentication"), 321 purple_request_yes_no(js->gc, _("Plaintext Authentication"),
322 _("Plaintext Authentication"), 322 _("Plaintext Authentication"),
323 msg, 323 msg,
324 2, js->gc->account, NULL, NULL, "account", js->gc->account, 324 2, js->gc->account, NULL, NULL, js->gc->account,
325 allow_cyrus_plaintext_auth, 325 allow_cyrus_plaintext_auth,
326 disallow_plaintext_auth); 326 disallow_plaintext_auth);
327 g_free(msg); 327 g_free(msg);
328 return; 328 return;
329 /* Everything else has failed, so fail the 329 /* Everything else has failed, so fail the
505 js->auth_type = JABBER_AUTH_PLAIN; 505 js->auth_type = JABBER_AUTH_PLAIN;
506 506
507 if(js->gsc == NULL && !purple_account_get_bool(js->gc->account, "auth_plain_in_clear", FALSE)) { 507 if(js->gsc == NULL && !purple_account_get_bool(js->gc->account, "auth_plain_in_clear", FALSE)) {
508 char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"), 508 char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"),
509 js->gc->account->username); 509 js->gc->account->username);
510 purple_request_yes_no_with_hint(js->gc, _("Plaintext Authentication"), 510 purple_request_yes_no(js->gc, _("Plaintext Authentication"),
511 _("Plaintext Authentication"), 511 _("Plaintext Authentication"),
512 msg, 512 msg,
513 2, 513 2,
514 purple_connection_get_account(js->gc), NULL, NULL, 514 purple_connection_get_account(js->gc), NULL, NULL,
515 "account", purple_connection_get_account(js->gc), 515 purple_connection_get_account(js->gc), allow_plaintext_auth,
516 allow_plaintext_auth, disallow_plaintext_auth); 516 disallow_plaintext_auth);
517 g_free(msg); 517 g_free(msg);
518 return; 518 return;
519 } 519 }
520 finish_plaintext_authentication(js); 520 finish_plaintext_authentication(js);
521 } else { 521 } else {
593 jabber_iq_send(iq); 593 jabber_iq_send(iq);
594 594
595 } else if(xmlnode_get_child(query, "password")) { 595 } else if(xmlnode_get_child(query, "password")) {
596 if(js->gsc == NULL && !purple_account_get_bool(js->gc->account, 596 if(js->gsc == NULL && !purple_account_get_bool(js->gc->account,
597 "auth_plain_in_clear", FALSE)) { 597 "auth_plain_in_clear", FALSE)) {
598 purple_request_yes_no_with_hint(js->gc, _("Plaintext Authentication"), 598 purple_request_yes_no(js->gc, _("Plaintext Authentication"),
599 _("Plaintext Authentication"), 599 _("Plaintext Authentication"),
600 _("This server requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"), 600 _("This server requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"),
601 2, 601 2,
602 purple_connection_get_account(js->gc), NULL, NULL, 602 purple_connection_get_account(js->gc), NULL, NULL,
603 "account", purple_connection_get_account(js->gc), 603 purple_connection_get_account(js->gc), allow_plaintext_auth,
604 allow_plaintext_auth, disallow_plaintext_auth); 604 disallow_plaintext_auth);
605 return; 605 return;
606 } 606 }
607 finish_plaintext_authentication(js); 607 finish_plaintext_authentication(js);
608 } else { 608 } else {
609 purple_connection_error(js->gc, 609 purple_connection_error(js->gc,