Mercurial > pidgin
comparison libpurple/protocols/jabber/auth.c @ 21244:a20ef7180680
Re-namespace the #defines to all be PURPLE_REQUEST_UI_HINT_*. I see no
reason that the common UI ones need to be in a different namespace from the
ones used by libpurple.
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 14 Oct 2007 20:53:40 +0000 |
parents | fba1f6c3df0b |
children | d4f95419be45 e747ac0c42d6 |
comparison
equal
deleted
inserted
replaced
21243:6402252be3c8 | 21244:a20ef7180680 |
---|---|
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_with_hint(js->gc, _("Plaintext Authentication"), |
322 _("Plaintext Authentication"), | 322 _("Plaintext Authentication"), |
323 msg, | 323 msg, |
324 2, js->gc->account, NULL, NULL, PURPLE_REQUEST_HINT_ACCOUNT, js->gc->account, | 324 2, js->gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_ACCOUNT, 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 |
510 purple_request_yes_no_with_hint(js->gc, _("Plaintext Authentication"), | 510 purple_request_yes_no_with_hint(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 PURPLE_REQUEST_HINT_ACCOUNT, purple_connection_get_account(js->gc), | 515 PURPLE_REQUEST_UI_HINT_ACCOUNT, purple_connection_get_account(js->gc), |
516 allow_plaintext_auth, disallow_plaintext_auth); | 516 allow_plaintext_auth, 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); |
598 purple_request_yes_no_with_hint(js->gc, _("Plaintext Authentication"), | 598 purple_request_yes_no_with_hint(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 PURPLE_REQUEST_HINT_ACCOUNT, purple_connection_get_account(js->gc), | 603 PURPLE_REQUEST_UI_HINT_ACCOUNT, purple_connection_get_account(js->gc), |
604 allow_plaintext_auth, disallow_plaintext_auth); | 604 allow_plaintext_auth, disallow_plaintext_auth); |
605 return; | 605 return; |
606 } | 606 } |
607 finish_plaintext_authentication(js); | 607 finish_plaintext_authentication(js); |
608 } else { | 608 } else { |