Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/auth_cyrus.c @ 32330:a5b556ac1de5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename purple_connection_error_reason to purple_connection_error
author Mark Doliner <mark@kingant.net>
date Sun, 21 Aug 2011 08:00:53 +0000
parents b1a6535f99d9
children
comparison
equal deleted inserted replaced
32329:5105d0306b2a 32330:a5b556ac1de5
32 char **error); 32 char **error);
33 static void jabber_sasl_build_callbacks(JabberStream *); 33 static void jabber_sasl_build_callbacks(JabberStream *);
34 34
35 static void disallow_plaintext_auth(PurpleAccount *account) 35 static void disallow_plaintext_auth(PurpleAccount *account)
36 { 36 {
37 purple_connection_error_reason(purple_account_get_connection(account), 37 purple_connection_error(purple_account_get_connection(account),
38 PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR, 38 PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
39 _("Server may require plaintext authentication over an unencrypted stream")); 39 _("Server may require plaintext authentication over an unencrypted stream"));
40 } 40 }
41 41
42 static void start_cyrus_wrapper(JabberStream *js) 42 static void start_cyrus_wrapper(JabberStream *js)
44 char *error = NULL; 44 char *error = NULL;
45 xmlnode *response = NULL; 45 xmlnode *response = NULL;
46 JabberSaslState state = jabber_auth_start_cyrus(js, &response, &error); 46 JabberSaslState state = jabber_auth_start_cyrus(js, &response, &error);
47 47
48 if (state == JABBER_SASL_STATE_FAIL) { 48 if (state == JABBER_SASL_STATE_FAIL) {
49 purple_connection_error_reason(js->gc, 49 purple_connection_error(js->gc,
50 PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE, 50 PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
51 error); 51 error);
52 g_free(error); 52 g_free(error);
53 } else if (response) { 53 } else if (response) {
54 jabber_send(js, response); 54 jabber_send(js, response);