# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1247947868 0
# Node ID 5f17bfa9dc70d8fb7eb116fbac24d22c6c892cce
# Parent  b419196556c78d6eb84199b4510a052b2b1ac199
To make grim happy (or more upset).

diff -r b419196556c7 -r 5f17bfa9dc70 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Sat Jul 18 18:32:47 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Jul 18 20:11:08 2009 +0000
@@ -719,8 +719,8 @@
 	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 @@
 	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 @@
 	} 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);
 	}