soc.2008.masterpassword: c03100cc: Fix MXit plugin compile.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: c03100cc2b1608e980accd7e725b46b6108aee6f
Parent:   3c655081a254d3921f6d1b1932247dd56d97d4bc
Author:   qulogic at pidgin.im
Date:     10/30/11 18:50:55
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/c03100cc2b1608e980accd7e725b46b6108aee6f

Changelog: 

Fix MXit plugin compile.

Changes against parent 3c655081a254d3921f6d1b1932247dd56d97d4bc

  patched  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/cipher.c

-------------- next part --------------
============================================================
--- libpurple/protocols/mxit/actions.c	322aa1361f77118a4b0b0cc41bddb58ef28df0b2
+++ libpurple/protocols/mxit/actions.c	476046a57c005057b794d206d51bfa0a899e5174
@@ -372,18 +372,18 @@ static void mxit_change_pin_action( Purp
 	purple_request_fields_add_group( fields, group );
 
 	/* pin */
-	field = purple_request_field_string_new( "pin", _( "PIN" ), purple_account_get_password( session->acc ), FALSE );
+	field = purple_request_field_string_new( "pin", _( "PIN" ), purple_connection_get_password( gc ), 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" ), purple_account_get_password( session->acc ), FALSE );
+	field = purple_request_field_string_new( "pin2", _( "Verify PIN" ), purple_connection_get_password( gc ), FALSE );
 	purple_request_field_string_set_masked( field, TRUE );
 	purple_request_field_group_add_field( group, field );
 
 	/* (reference: "libpurple/request.h") */
 	purple_request_fields( gc, _( "Change PIN" ), _( "Change MXit PIN" ), NULL, fields, _( "Set" ),
-			G_CALLBACK( mxit_change_pin_cb ), _( "Cancel" ), NULL, purple_connection_get_account( gc ), NULL, NULL, gc );
+			G_CALLBACK( mxit_change_pin_cb ), _( "Cancel" ), NULL, session->acc, NULL, NULL, gc );
 }
 
 
============================================================
--- libpurple/protocols/mxit/cipher.c	df932e8124c5aeaaaf83e71dafae57ac80df691e
+++ libpurple/protocols/mxit/cipher.c	05a6112be0a338835a3fad36b6e4028fb885b55c
@@ -79,7 +79,7 @@ static char* transport_layer_key( struct
 static char* transport_layer_key( struct MXitSession* session )
 {
 	static char	key[16 + 1];
-	const char*	password		= purple_account_get_password( session->acc );
+	const char*	password		= purple_connection_get_password( session->con );
 	int			passlen			= strlen( password );
 
 	/* initialize with initial key */
@@ -125,7 +125,7 @@ char* mxit_encrypt_password( struct MXit
 
 	/* build the secret data to be encrypted: SECRET_HEADER + password */
 	pass = g_string_new( SECRET_HEADER );
-	g_string_append( pass, purple_account_get_password( session->acc) );
+	g_string_append( pass, purple_connection_get_password( session->con ) );
 	padding_add( pass );		/* add ISO10126 padding */
 
 	/* now encrypt the secret. we encrypt each block separately (ECB mode) */