gobjectification: e16bd860: Fix busted merge.

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: e16bd86095dcd0d922811467580eb56e2804abd6
Ancestor: 98e04213689606d731ff9c41d4bb7bba1ea5c264
Author: sadrul at pidgin.im
Date: 2008-05-03T01:49:44
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/e16bd86095dcd0d922811467580eb56e2804abd6

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

ChangeLog: 

Fix busted merge.

-------------- next part --------------
============================================================
--- libpurple/account.c	e92527816a8f2b41e5c648468b4a294ea58438ea
+++ libpurple/account.c	6d1194c78054f7b5b4980b4e25361b5542620ce1
@@ -43,10 +43,10 @@
 #include "util.h"
 #include "xmlnode.h"
 
-typedef struct _PurpleAccountPrivate
+struct _PurpleAccountPrivate
 {
 	PurpleConnectionErrorInfo *current_error;
-} PurpleAccountPrivate;
+};
 
 #define PURPLE_ACCOUNT_GET_PRIVATE(account) \
 	((PurpleAccountPrivate *) (account->priv))
============================================================
--- libpurple/protocols/jabber/auth.c	c0c6fd068d5ff65963d604e8d71df07f2e2a6448
+++ libpurple/protocols/jabber/auth.c	b6999e84387ddf7e62035f1d38c5509ae2f873db
@@ -55,7 +55,7 @@ jabber_process_starttls(JabberStream *js
 				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
 				_("Server requires TLS/SSL for login.  No TLS/SSL support found."));
 			return TRUE;
-		} else if(purple_account_get_bool(js->gc->account, "require_tls", FALSE)) {
+		} else if(purple_account_get_bool(purple_connection_get_account(js->gc), "require_tls", FALSE)) {
 			purple_connection_error_reason (js->gc,
 				 PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
 				_("You require encryption, but no TLS/SSL support found."));
@@ -265,7 +265,7 @@ auth_no_pass_cb(PurpleConnection *conn, 
 	js = purple_object_get_protocol_data(PURPLE_OBJECT(conn));
 
 	/* Disable the account as the user has canceled connecting */
-	purple_account_set_enabled(conn->account, purple_core_get_ui(), FALSE);
+	purple_account_set_enabled(purple_connection_get_account(conn), purple_core_get_ui(), FALSE);
 }
 
 static void jabber_auth_start_cyrus(JabberStream *js)
@@ -723,7 +723,7 @@ static void auth_old_cb(JabberStream *js
 			if(js->gsc == NULL && !purple_account_get_bool(purple_connection_get_account(js->gc),
 						"auth_plain_in_clear", FALSE)) {
 				char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
-											js->gc->account->username);
+											purple_connection_get_account(js->gc)->username);
 				purple_request_yes_no(js->gc, _("Plaintext Authentication"),
 						_("Plaintext Authentication"),
 						msg,