pidgin: 7635af82: jabber: Pedantically this bothered me, b...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 7635af82fd23cb8baaab2cab5a8cbeb76f3ea5be
Ancestor: 69a649b99c90bd4f4492fab3376f861e43d057ea
Author: darkrain42 at pidgin.im
Date: 2010-01-21T20:28:41
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7635af82fd23cb8baaab2cab5a8cbeb76f3ea5be

Modified files:
        libpurple/protocols/jabber/jabber.c

ChangeLog: 

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().

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	23cc0b79ec20b9927f64528151c05947d368fe28
+++ libpurple/protocols/jabber/jabber.c	5fde4cbdc6997b36bb527279de58f6431618ea12
@@ -678,14 +678,14 @@ jabber_login_callback(gpointer data, gin
 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);
 		}