cpw.darkrain42.xmpp.scram: c2825860: jabber: A little more use of accessors.

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: c282586092948d0e0797cec6a76b53d19b776227
Ancestor: ae90e3913d29e34afc722d936f1bf65d41fb86c2
Author: darkrain42 at pidgin.im
Date: 2009-11-07T07:03:49
Branch: im.pidgin.cpw.darkrain42.xmpp.scram
URL: http://d.pidgin.im/viewmtn/revision/info/c282586092948d0e0797cec6a76b53d19b776227

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

ChangeLog: 

jabber: A little more use of accessors.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/auth_cyrus.c	6e4e7ddd40cb4fcc98aad60aff68ce365449b131
+++ libpurple/protocols/jabber/auth_cyrus.c	6c421e4beca5fd3dbb530ae6d30a950d06c84247
@@ -155,18 +155,20 @@ static void
 }
 
 static void
-auth_no_pass_cb(PurpleConnection *conn, PurpleRequestFields *fields)
+auth_no_pass_cb(PurpleConnection *gc, PurpleRequestFields *fields)
 {
+	PurpleAccount *account;
 	JabberStream *js;
 
 	/* The password prompt dialog doesn't get disposed if the account disconnects */
-	if (!PURPLE_CONNECTION_IS_VALID(conn))
+	if (!PURPLE_CONNECTION_IS_VALID(gc))
 		return;
 
-	js = conn->proto_data;
+	account = purple_connection_get_account(gc);
+	js = purple_connection_get_protocol_data(gc);
 
 	/* Disable the account as the user has canceled connecting */
-	purple_account_set_enabled(conn->account, purple_core_get_ui(), FALSE);
+	purple_account_set_enabled(account, purple_core_get_ui(), FALSE);
 }
 
 static xmlnode *jabber_auth_start_cyrus(JabberStream *js)