# HG changeset patch # User Paul Aurich # Date 1264105721 0 # Node ID 4189f9e1627ba750647fa05ef81b6af8150f64a2 # Parent ddad759dc05bc69d0fa2692fe9416ecff57d1cbb jabber: Pedantically this bothered me, but changing the message to definitively say which was going to happen next would duplicate logic from try_srv_connect(). diff -r ddad759dc05b -r 4189f9e1627b libpurple/protocols/jabber/jabber.c --- a/libpurple/protocols/jabber/jabber.c Thu Jan 21 20:23:38 2010 +0000 +++ b/libpurple/protocols/jabber/jabber.c Thu Jan 21 20:28:41 2010 +0000 @@ -678,14 +678,14 @@ jabber_login_callback(gpointer data, gint source, const gchar *error) { PurpleConnection *gc = data; - JabberStream *js = gc->proto_data; + JabberStream *js = purple_connection_get_protocol_data(gc); if (source < 0) { if (js->srv_rec != NULL) { - purple_debug_error("jabber", "Unable to connect to server: %s. Trying next SRV record.\n", error); + purple_debug_error("jabber", "Unable to connect to server: %s. Trying next SRV record or connecting directly.\n", error); try_srv_connect(js); } else { - purple_debug_info("jabber","Couldn't connect directly to %s. Trying to find alternative connection methods, like BOSH.\n", js->user->domain); + purple_debug_info("jabber","Couldn't connect directly to %s. Trying to find alternative connection methods, like BOSH.\n", js->user->domain); js->srv_query_data = purple_txt_resolve("_xmppconnect", js->user->domain, txt_resolved_cb, js); }