gobjectification: bf491235: Revert the unintended changeset. This sh...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: bf491235084f4b4af8d1b42701539dbcdd9787fe
Ancestor: e16bd86095dcd0d922811467580eb56e2804abd6
Author: sadrul at pidgin.im
Date: 2008-05-04T23:56:17
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/bf491235084f4b4af8d1b42701539dbcdd9787fe

Modified files:
        libpurple/protocols/gg/lib/events.c
        libpurple/protocols/gg/lib/libgadu.c

ChangeLog: 

Revert the unintended changeset. This should make this compile again, I
think.

-------------- next part --------------
============================================================
--- libpurple/protocols/gg/lib/events.c	9391bec260b9c5c0c52c607415494988be5291a1
+++ libpurple/protocols/gg/lib/events.c	c67c8bfde77d3245124d709267257c77443041e2
@@ -1339,7 +1339,7 @@ struct gg_event *gg_watch_fd(struct gg_s
 			struct gg_welcome *w;
 			struct gg_login60 l;
 			unsigned int hash;
-			char *password = purple_account_get_password(sess);
+			char *password = sess->password;
 			int ret;
 			
 			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_READING_KEY\n");
@@ -1406,8 +1406,8 @@ struct gg_event *gg_watch_fd(struct gg_s
 	
 			free(h);
 
-			free(purple_account_get_password(sess));
-			purple_account_get_password(sess) = NULL;
+			free(sess->password);
+			sess->password = NULL;
 
 			{
 				struct in_addr dcc_ip;
============================================================
--- libpurple/protocols/gg/lib/libgadu.c	91021c83f2e46b36dee45fff0cf1f4f5368c9fc0
+++ libpurple/protocols/gg/lib/libgadu.c	f1bef314ab64c75e4d40ff5671c8c5ca7d774b39
@@ -968,13 +968,13 @@ struct gg_session *gg_login(const struct
 
 	memset(sess, 0, sizeof(struct gg_session));
 
-	if (!purple_account_get_password(p) || !p->uin) {
+	if (!p->password || !p->uin) {
 		gg_debug(GG_DEBUG_MISC, "// gg_login() invalid arguments. uin and password needed\n");
 		errno = EFAULT;
 		goto fail;
 	}
 
-	if (!(purple_account_get_password(sess) = strdup(purple_account_get_password(p)))) {
+	if (!(sess->password = strdup(p->password))) {
 		gg_debug(GG_DEBUG_MISC, "// gg_login() not enough memory for password\n");
 		goto fail;
 	}
@@ -1137,8 +1137,8 @@ fail:
 
 fail:
 	if (sess) {
-		if (purple_account_get_password(sess))
-			free(purple_account_get_password(sess));
+		if (sess->password)
+			free(sess->password);
 		if (sess->initial_descr)
 			free(sess->initial_descr);
 		free(sess);
@@ -1161,8 +1161,8 @@ void gg_free_session(struct gg_session *
 
 	/* XXX dopisaæ zwalnianie i zamykanie wszystkiego, co mog³o zostaæ */
 
-	if (purple_account_get_password(sess))
-		free(purple_account_get_password(sess));
+	if (sess->password)
+		free(sess->password);
 	
 	if (sess->initial_descr)
 		free(sess->initial_descr);