Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/auth.c @ 29097:cea22db36ffc
jabber: Use NS_XMPP_SASL
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Fri, 27 Nov 2009 20:41:22 +0000 |
| parents | c1d41b7484ff |
| children | 4f45aae3ace1 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/auth.c Fri Nov 27 20:36:31 2009 +0000 +++ b/libpurple/protocols/jabber/auth.c Fri Nov 27 20:41:22 2009 +0000 @@ -111,6 +111,7 @@ _("Server requires plaintext authentication over an unencrypted stream")); } +#ifdef HAVE_CYRUS_SASL static void auth_old_pass_cb(PurpleConnection *gc, PurpleRequestFields *fields) { @@ -154,6 +155,7 @@ /* Disable the account as the user has canceled connecting */ purple_account_set_enabled(purple_connection_get_account(gc), purple_core_get_ui(), FALSE); } +#endif void jabber_auth_start(JabberStream *js, xmlnode *packet) @@ -403,7 +405,7 @@ { const char *ns = xmlnode_get_namespace(packet); - if (!purple_strequal(ns, "urn:ietf:params:xml:ns:xmpp-sasl")) { + if (!purple_strequal(ns, NS_XMPP_SASL)) { purple_connection_error_reason(js->gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Invalid response from server")); @@ -424,7 +426,7 @@ { const char *ns = xmlnode_get_namespace(packet); - if (!purple_strequal(ns, "urn:ietf:params:xml:ns:xmpp-sasl")) { + if (!purple_strequal(ns, NS_XMPP_SASL)) { purple_connection_error_reason(js->gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Invalid response from server"));