pidgin: d685fdc1: To make grim happy (or more upset).

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: d685fdc18836afdf539df5eba6ede4bf8b2b7096
Ancestor: f0bb331be0eb9eb81e5741fefb0dc7ce45a1d4a3
Author: darkrain42 at pidgin.im
Date: 2009-07-18T20:11:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d685fdc18836afdf539df5eba6ede4bf8b2b7096

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

ChangeLog: 

To make grim happy (or more upset).

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	392595bba12972e25fc0c4508148b3290355506a
+++ libpurple/protocols/jabber/jabber.c	064736e1e67a91377d696f8fc4e4b12a748239ec
@@ -719,8 +719,8 @@ static gboolean jabber_login_connect(Jab
 	else
 		js->serverFQDN = g_strdup(host);
 
-	if (purple_proxy_connect(js->gc, js->gc->account, host,
-			port, jabber_login_callback, js->gc) == NULL) {
+	if (purple_proxy_connect(js->gc, purple_connection_get_account(js->gc),
+			host, port, jabber_login_callback, js->gc) == NULL) {
 		if (fatal_failure) {
 			purple_connection_error_reason(js->gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
@@ -749,7 +749,7 @@ static void try_srv_connect(JabberStream
 	ascii_domain = jabber_try_idna_to_ascii(js->user->domain);
 	/* Fall back to the defaults (I'm not sure if we should actually do this) */
 	jabber_login_connect(js, js->user->domain, ascii_domain,
-			purple_account_get_int(js->gc->account, "port", 5222),
+			purple_account_get_int(purple_connection_get_account(js->gc), "port", 5222),
 			TRUE, TRUE);
 	g_free(ascii_domain);
 }
@@ -767,7 +767,7 @@ static void srv_resolved_cb(PurpleSrvRes
 	} else {
 		char *ascii_domain = jabber_try_idna_to_ascii(js->user->domain);
 		jabber_login_connect(js, js->user->domain, ascii_domain,
-				purple_account_get_int(js->gc->account, "port", 5222),
+				purple_account_get_int(purple_connection_get_account(js->gc), "port", 5222),
 				TRUE, TRUE);
 		g_free(ascii_domain);
 	}