gobjectification: aba55b02: Fix prpl compile.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: aba55b02e9ceeef2dbb0b6220693e8516827a90a
Parent:   d09665d5d50728e95aa519558adde8b648c0a28f
Author:   qulogic at pidgin.im
Date:     05/11/11 01:09:29
Branch:   im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/aba55b02e9ceeef2dbb0b6220693e8516827a90a

Changelog: 

Fix prpl compile.

Changes against parent d09665d5d50728e95aa519558adde8b648c0a28f

  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/jabber/buddy.c
  patched  libpurple/protocols/mxit/actions.c

-------------- next part --------------
============================================================
--- libpurple/protocols/gg/gg.c	191e32caee57550f703547847c223364e8aa1647
+++ libpurple/protocols/gg/gg.c	39ca411b6f01b4784674b532afff8372d19dd5c4
@@ -2354,6 +2354,7 @@ static unsigned int ggp_send_typing(Purp
 
 static unsigned int ggp_send_typing(PurpleConnection *gc, const char *name, PurpleTypingState state)
 {
+	GGPInfo *info = purple_object_get_protocol_data(PURPLE_OBJECT(gc));
 	int dummy_length; // we don't send real length of typed message
 	
 	if (state == PURPLE_TYPED) // not supported
@@ -2365,7 +2366,7 @@ static unsigned int ggp_send_typing(Purp
 		dummy_length = 0;
 	
 	gg_typing_notification(
-		((GGPInfo*)gc->proto_data)->session,
+		info->session,
 		ggp_str_to_uin(name),
 		dummy_length); 
 	
============================================================
--- libpurple/protocols/jabber/buddy.c	7b8a86c7c81f706204053abc38d14aaf9b301a4e
+++ libpurple/protocols/jabber/buddy.c	3932f9f4a2967c6001fbe866731a50b03aa493a2
@@ -2233,10 +2233,10 @@ void jabber_user_search(JabberStream *js
 	   make sure we aren't persisting an old value */
 	if(js->user_directories && js->user_directories->data &&
 	   !strcmp(directory, js->user_directories->data)) {
-		purple_account_set_string(js->gc->account, "user_directory", "");
+		purple_account_set_string(purple_connection_get_account(js->gc), "user_directory", "");
 	}
 	else {
-		purple_account_set_string(js->gc->account, "user_directory", directory);
+		purple_account_set_string(purple_connection_get_account(js->gc), "user_directory", directory);
 	}
 
 	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:search");
============================================================
--- libpurple/protocols/mxit/actions.c	7026b36607166508bdbe9c59ee0da87c4ff986fd
+++ libpurple/protocols/mxit/actions.c	4c7bdd6a560538f186bf223b408b673a3767df6b
@@ -372,19 +372,22 @@ static void mxit_change_pin_action( Purp
 	PurpleRequestFieldGroup*	group	= NULL;
 	PurpleRequestField*			field	= NULL;
 
+	const char *				password = NULL;
+
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_change_pin_action\n" );
 
 	fields = purple_request_fields_new();
 	group = purple_request_field_group_new(NULL);
 	purple_request_fields_add_group(fields, group);
+	password = purple_account_get_password(session->acc);
 
 	/* pin */
-	field = purple_request_field_string_new( "pin", _( "PIN" ), session->acc->password, FALSE );
+	field = purple_request_field_string_new( "pin", _( "PIN" ), password, FALSE );
 	purple_request_field_string_set_masked( field, TRUE );
 	purple_request_field_group_add_field( group, field );
 
 	/* verify pin */
-	field = purple_request_field_string_new( "pin2", _( "Verify PIN" ), session->acc->password, FALSE );
+	field = purple_request_field_string_new( "pin2", _( "Verify PIN" ), password, FALSE );
 	purple_request_field_string_set_masked( field, TRUE );
 	purple_request_field_group_add_field( group, field );