s/gaim_connection/im_connection/ and some other minor API changes. The rest

will come tomorrow. It compiles, I'll leave the real testing up to someone
else. ;-)

1 files changed, 112 insertions, 112 deletions

diff --git a/protocols/msn/ns.c b/protocols/msn/ns.c
index 9774f3e2..9d86a68e 100644
--- a/protocols/msn/ns.c
+++ b/protocols/msn/ns.c
@@ -37,26 +37,26 @@ static void msn_auth_got_passport_id( struct passport_reply *rep );
 
 gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond )
 {
-	struct gaim_connection *gc = data;
+	struct im_connection *ic = data;
 	struct msn_data *md;
 	char s[1024];
 	
-	if( !g_slist_find( msn_connections, gc ) )
+	if( !g_slist_find( msn_connections, ic ) )
 		return FALSE;
 	
 	if( source == -1 )
 	{
-		hide_login_progress( gc, "Could not connect to server" );
-		signoff( gc );
+		hide_login_progress( ic, "Could not connect to server" );
+		signoff( ic );
 		return FALSE;
 	}
 	
-	md = gc->proto_data;
+	md = ic->proto_data;
 	
 	if( !md->handler )
 	{
 		md->handler = g_new0( struct msn_handler_data, 1 );
-		md->handler->data = gc;
+		md->handler->data = ic;
 		md->handler->exec_command = msn_ns_command;
 		md->handler->exec_message = msn_ns_message;
 	}
@@ -72,10 +72,10 @@ gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond )
 	md->handler->rxq = g_new0( char, 1 );
 	
 	g_snprintf( s, sizeof( s ), "VER %d MSNP8 CVR0\r\n", ++md->trId );
-	if( msn_write( gc, s, strlen( s ) ) )
+	if( msn_write( ic, s, strlen( s ) ) )
 	{
-		gc->inpa = b_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, gc );
-		set_login_progress( gc, 1, "Connected to server, waiting for reply" );
+		ic->inpa = b_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, ic );
+		set_login_progress( ic, 1, "Connected to server, waiting for reply" );
 	}
 	
 	return FALSE;
@@ -83,13 +83,13 @@ gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond )
 
 static gboolean msn_ns_callback( gpointer data, gint source, b_input_condition cond )
 {
-	struct gaim_connection *gc = data;
-	struct msn_data *md = gc->proto_data;
+	struct im_connection *ic = data;
+	struct msn_data *md = ic->proto_data;
 	
 	if( msn_handler( md->handler ) == -1 ) /* Don't do this on ret == 0, it's already done then. */
 	{
-		hide_login_progress( gc, "Error while reading from server" );
-		signoff( gc );
+		hide_login_progress( ic, "Error while reading from server" );
+		signoff( ic );
 		
 		return FALSE;
 	}
@@ -99,8 +99,8 @@ static gboolean msn_ns_callback( gpointer data, gint source, b_input_condition c
 
 static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 {
-	struct gaim_connection *gc = data;
-	struct msn_data *md = gc->proto_data;
+	struct im_connection *ic = data;
+	struct msn_data *md = ic->proto_data;
 	char buf[1024];
 	
 	if( num_parts == 0 )
@@ -113,20 +113,20 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 	{
 		if( cmd[2] && strncmp( cmd[2], "MSNP8", 5 ) != 0 )
 		{
-			hide_login_progress( gc, "Unsupported protocol" );
-			signoff( gc );
+			hide_login_progress( ic, "Unsupported protocol" );
+			signoff( ic );
 			return( 0 );
 		}
 		
 		g_snprintf( buf, sizeof( buf ), "CVR %d 0x0409 mac 10.2.0 ppc macmsgs 3.5.1 macmsgs %s\r\n",
-		                                ++md->trId, gc->username );
-		return( msn_write( gc, buf, strlen( buf ) ) );
+		                                ++md->trId, ic->username );
+		return( msn_write( ic, buf, strlen( buf ) ) );
 	}
 	else if( strcmp( cmd[0], "CVR" ) == 0 )
 	{
 		/* We don't give a damn about the information we just received */
-		g_snprintf( buf, sizeof( buf ), "USR %d TWN I %s\r\n", ++md->trId, gc->username );
-		return( msn_write( gc, buf, strlen( buf ) ) );
+		g_snprintf( buf, sizeof( buf ), "USR %d TWN I %s\r\n", ++md->trId, ic->username );
+		return( msn_write( ic, buf, strlen( buf ) ) );
 	}
 	else if( strcmp( cmd[0], "XFR" ) == 0 )
 	{
@@ -135,24 +135,24 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 		
 		if( num_parts == 6 && strcmp( cmd[2], "NS" ) == 0 )
 		{
-			b_event_remove( gc->inpa );
-			gc->inpa = 0;
+			b_event_remove( ic->inpa );
+			ic->inpa = 0;
 			closesocket( md->fd );
 			
 			server = strchr( cmd[3], ':' );
 			if( !server )
 			{
-				hide_login_progress_error( gc, "Syntax error" );
-				signoff( gc );
+				hide_login_progress_error( ic, "Syntax error" );
+				signoff( ic );
 				return( 0 );
 			}
 			*server = 0;
 			port = atoi( server + 1 );
 			server = cmd[3];
 			
-			set_login_progress( gc, 1, "Transferring to other server" );
+			set_login_progress( ic, 1, "Transferring to other server" );
 			
-			md->fd = proxy_connect( server, port, msn_ns_connected, gc );
+			md->fd = proxy_connect( server, port, msn_ns_connected, ic );
 		}
 		else if( num_parts == 6 && strcmp( cmd[2], "SB" ) == 0 )
 		{
@@ -161,8 +161,8 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 			server = strchr( cmd[3], ':' );
 			if( !server )
 			{
-				hide_login_progress_error( gc, "Syntax error" );
-				signoff( gc );
+				hide_login_progress_error( ic, "Syntax error" );
+				signoff( ic );
 				return( 0 );
 			}
 			*server = 0;
@@ -171,13 +171,13 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 			
 			if( strcmp( cmd[4], "CKI" ) != 0 )
 			{
-				hide_login_progress_error( gc, "Unknown authentication method for switchboard" );
-				signoff( gc );
+				hide_login_progress_error( ic, "Unknown authentication method for switchboard" );
+				signoff( ic );
 				return( 0 );
 			}
 			
 			debug( "Connecting to a new switchboard with key %s", cmd[5] );
-			sb = msn_sb_create( gc, server, port, cmd[5], MSN_SB_NEW );
+			sb = msn_sb_create( ic, server, port, cmd[5], MSN_SB_NEW );
 			
 			if( md->msgq )
 			{
@@ -203,8 +203,8 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 		}
 		else
 		{
-			hide_login_progress_error( gc, "Syntax error" );
-			signoff( gc );
+			hide_login_progress_error( ic, "Syntax error" );
+			signoff( ic );
 			return( 0 );
 		}
 	}
@@ -213,10 +213,10 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 		if( num_parts == 5 && strcmp( cmd[2], "TWN" ) == 0 && strcmp( cmd[3], "S" ) == 0 )
 		{
 			/* Time for some Passport black magic... */
-			if( !passport_get_id( msn_auth_got_passport_id, gc, gc->username, gc->password, cmd[4] ) )
+			if( !passport_get_id( msn_auth_got_passport_id, ic, ic->username, ic->password, cmd[4] ) )
 			{
-				hide_login_progress_error( gc, "Error while contacting Passport server" );
-				signoff( gc );
+				hide_login_progress_error( ic, "Error while contacting Passport server" );
+				signoff( ic );
 				return( 0 );
 			}
 		}
@@ -226,24 +226,24 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 			
 			http_decode( cmd[4] );
 			
-			strncpy( gc->displayname, cmd[4], sizeof( gc->displayname ) );
-			gc->displayname[sizeof(gc->displayname)-1] = 0;
+			strncpy( ic->displayname, cmd[4], sizeof( ic->displayname ) );
+			ic->displayname[sizeof(ic->displayname)-1] = 0;
 			
-			if( ( s = set_find( &gc->acc->set, "display_name" ) ) )
+			if( ( s = set_find( &ic->acc->set, "display_name" ) ) )
 			{
 				g_free( s->value );
 				s->value = g_strdup( cmd[4] );
 			}
 			
-			set_login_progress( gc, 1, "Authenticated, getting buddy list" );
+			set_login_progress( ic, 1, "Authenticated, getting buddy list" );
 			
 			g_snprintf( buf, sizeof( buf ), "SYN %d 0\r\n", ++md->trId );
-			return( msn_write( gc, buf, strlen( buf ) ) );
+			return( msn_write( ic, buf, strlen( buf ) ) );
 		}
 		else
 		{
-			hide_login_progress( gc, "Unknown authentication type" );
-			signoff( gc );
+			hide_login_progress( ic, "Unknown authentication type" );
+			signoff( ic );
 			return( 0 );
 		}
 	}
@@ -251,8 +251,8 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 	{
 		if( num_parts != 4 )
 		{
-			hide_login_progress_error( gc, "Syntax error" );
-			signoff( gc );
+			hide_login_progress_error( ic, "Syntax error" );
+			signoff( ic );
 			return( 0 );
 		}
 		
@@ -260,8 +260,8 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 		
 		if( md->handler->msglen <= 0 )
 		{
-			hide_login_progress_error( gc, "Syntax error" );
-			signoff( gc );
+			hide_login_progress_error( ic, "Syntax error" );
+			signoff( ic );
 			return( 0 );
 		}
 	}
@@ -275,14 +275,14 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 				md->grouplist = g_new0( char *, md->groupcount );
 			
 			if( !*cmd[3] || md->buddycount == 0 )
-				msn_logged_in( gc );
+				msn_logged_in( ic );
 		}
 		else
 		{
 			/* Hrrm... This SYN reply doesn't really look like something we expected.
 			   Let's assume everything is okay. */
 			
-			msn_logged_in( gc );
+			msn_logged_in( ic );
 		}
 	}
 	else if( strcmp( cmd[0], "LST" ) == 0 )
@@ -291,8 +291,8 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 		
 		if( num_parts != 4 && num_parts != 5 )
 		{
-			hide_login_progress( gc, "Syntax error" );
-			signoff( gc );
+			hide_login_progress( ic, "Syntax error" );
+			signoff( ic );
 			return( 0 );
 		}
 		
@@ -307,33 +307,33 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 			if( cmd[4] != NULL && sscanf( cmd[4], "%d", &num ) == 1 )
 				group = md->grouplist[num];
 			
-			add_buddy( gc, group, cmd[1], cmd[2] );
+			add_buddy( ic, group, cmd[1], cmd[2] );
 		}
 		if( list & 2 ) /* AL */
 		{
-			gc->permit = g_slist_append( gc->permit, g_strdup( cmd[1] ) );
+			ic->permit = g_slist_append( ic->permit, g_strdup( cmd[1] ) );
 		}
 		if( list & 4 ) /* BL */
 		{
-			gc->deny = g_slist_append( gc->deny, g_strdup( cmd[1] ) );
+			ic->deny = g_slist_append( ic->deny, g_strdup( cmd[1] ) );
 		}
 		if( list & 8 ) /* RL */
 		{
 			if( ( list & 6 ) == 0 )
-				msn_buddy_ask( gc, cmd[1], cmd[2] );
+				msn_buddy_ask( ic, cmd[1], cmd[2] );
 		}
 		
 		if( --md->buddycount == 0 )
 		{
-			if( gc->flags & OPT_LOGGED_IN )
+			if( ic->flags & OPT_LOGGED_IN )
 			{
-				serv_got_crap( gc, "Successfully transferred to different server" );
+				serv_got_crap( ic, "Successfully transferred to different server" );
 				g_snprintf( buf, sizeof( buf ), "CHG %d %s %d\r\n", ++md->trId, md->away_state->code, 0 );
-				return( msn_write( gc, buf, strlen( buf ) ) );
+				return( msn_write( ic, buf, strlen( buf ) ) );
 			}
 			else
 			{
-				msn_logged_in( gc );
+				msn_logged_in( ic );
 			}
 		}
 	}
@@ -343,8 +343,8 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 		
 		if( num_parts != 4 )
 		{
-			hide_login_progress_error( gc, "Syntax error" );
-			signoff( gc );
+			hide_login_progress_error( ic, "Syntax error" );
+			signoff( ic );
 			return( 0 );
 		}
 		
@@ -362,8 +362,8 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 		
 		if( num_parts != 3 )
 		{
-			hide_login_progress_error( gc, "Syntax error" );
-			signoff( gc );
+			hide_login_progress_error( ic, "Syntax error" );
+			signoff( ic );
 			return( 0 );
 		}
 		
@@ -376,7 +376,7 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 		for( i = 0; i < 16; i ++ )
 			g_snprintf( buf + strlen( buf ), 3, "%02x", digest[i] );
 		
-		return( msn_write( gc, buf, strlen( buf ) ) );
+		return( msn_write( ic, buf, strlen( buf ) ) );
 	}
 	else if( strcmp( cmd[0], "ILN" ) == 0 )
 	{
@@ -384,13 +384,13 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 		
 		if( num_parts != 6 )
 		{
-			hide_login_progress_error( gc, "Syntax error" );
-			signoff( gc );
+			hide_login_progress_error( ic, "Syntax error" );
+			signoff( ic );
 			return( 0 );
 		}
 		
 		http_decode( cmd[4] );
-		serv_buddy_rename( gc, cmd[3], cmd[4] );
+		serv_buddy_rename( ic, cmd[3], cmd[4] );
 		
 		st = msn_away_state_by_code( cmd[2] );
 		if( !st )
@@ -399,12 +399,12 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 			st = msn_away_state_list;
 		}
 		
-		serv_got_update( gc, cmd[3], 1, 0, 0, 0, st->number, 0 );
+		serv_got_update( ic, cmd[3], 1, 0, 0, 0, st->number, 0 );
 	}
 	else if( strcmp( cmd[0], "FLN" ) == 0 )
 	{
 		if( cmd[1] )
-			serv_got_update( gc, cmd[1], 0, 0, 0, 0, 0, 0 );
+			serv_got_update( ic, cmd[1], 0, 0, 0, 0, 0, 0 );
 	}
 	else if( strcmp( cmd[0], "NLN" ) == 0 )
 	{
@@ -412,13 +412,13 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 		
 		if( num_parts != 5 )
 		{
-			hide_login_progress_error( gc, "Syntax error" );
-			signoff( gc );
+			hide_login_progress_error( ic, "Syntax error" );
+			signoff( ic );
 			return( 0 );
 		}
 		
 		http_decode( cmd[3] );
-		serv_buddy_rename( gc, cmd[2], cmd[3] );
+		serv_buddy_rename( ic, cmd[2], cmd[3] );
 		
 		st = msn_away_state_by_code( cmd[1] );
 		if( !st )
@@ -427,7 +427,7 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 			st = msn_away_state_list;
 		}
 		
-		serv_got_update( gc, cmd[2], 1, 0, 0, 0, st->number, 0 );
+		serv_got_update( ic, cmd[2], 1, 0, 0, 0, st->number, 0 );
 	}
 	else if( strcmp( cmd[0], "RNG" ) == 0 )
 	{
@@ -437,8 +437,8 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 		
 		if( num_parts != 7 )
 		{
-			hide_login_progress_error( gc, "Syntax error" );
-			signoff( gc );
+			hide_login_progress_error( ic, "Syntax error" );
+			signoff( ic );
 			return( 0 );
 		}
 		
@@ -447,8 +447,8 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 		server = strchr( cmd[2], ':' );
 		if( !server )
 		{
-			hide_login_progress_error( gc, "Syntax error" );
-			signoff( gc );
+			hide_login_progress_error( ic, "Syntax error" );
+			signoff( ic );
 			return( 0 );
 		}
 		*server = 0;
@@ -457,14 +457,14 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 		
 		if( strcmp( cmd[3], "CKI" ) != 0 )
 		{
-			hide_login_progress_error( gc, "Unknown authentication method for switchboard" );
-			signoff( gc );
+			hide_login_progress_error( ic, "Unknown authentication method for switchboard" );
+			signoff( ic );
 			return( 0 );
 		}
 		
 		debug( "Got a call from %s (session %d). Key = %s", cmd[5], session, cmd[4] );
 		
-		sb = msn_sb_create( gc, server, port, cmd[4], session );
+		sb = msn_sb_create( ic, server, port, cmd[4], session );
 		sb->who = g_strdup( cmd[5] );
 	}
 	else if( strcmp( cmd[0], "ADD" ) == 0 )
@@ -477,60 +477,60 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 			
 			if( strchr( cmd[4], '@' ) == NULL )
 			{
-				hide_login_progress_error( gc, "Syntax error" );
-				signoff( gc );
+				hide_login_progress_error( ic, "Syntax error" );
+				signoff( ic );
 				return( 0 );
 			}
 			
 			/* We got added by someone. If we don't have this person in permit/deny yet, inform the user. */
-			for( l = gc->permit; l; l = l->next )
+			for( l = ic->permit; l; l = l->next )
 				if( g_strcasecmp( l->data, cmd[4] ) == 0 )
 					return( 1 );
 			
-			for( l = gc->deny; l; l = l->next )
+			for( l = ic->deny; l; l = l->next )
 				if( g_strcasecmp( l->data, cmd[4] ) == 0 )
 					return( 1 );
 			
-			msn_buddy_ask( gc, cmd[4], cmd[5] );
+			msn_buddy_ask( ic, cmd[4], cmd[5] );
 		}
 	}
 	else if( strcmp( cmd[0], "OUT" ) == 0 )
 	{
 		if( cmd[1] && strcmp( cmd[1], "OTH" ) == 0 )
 		{
-			hide_login_progress_error( gc, "Someone else logged in with your account" );
-			gc->wants_to_die = 1;
+			hide_login_progress_error( ic, "Someone else logged in with your account" );
+			ic->wants_to_die = 1;
 		}
 		else if( cmd[1] && strcmp( cmd[1], "SSD" ) == 0 )
 		{
-			hide_login_progress_error( gc, "Terminating session because of server shutdown" );
+			hide_login_progress_error( ic, "Terminating session because of server shutdown" );
 		}
 		else
 		{
-			hide_login_progress_error( gc, "Session terminated by remote server (reason unknown)" );
+			hide_login_progress_error( ic, "Session terminated by remote server (reason unknown)" );
 		}
 		
-		signoff( gc );
+		signoff( ic );
 		return( 0 );
 	}
 	else if( strcmp( cmd[0], "REA" ) == 0 )
 	{
 		if( num_parts != 5 )
 		{
-			hide_login_progress_error( gc, "Syntax error" );
-			signoff( gc );
+			hide_login_progress_error( ic, "Syntax error" );
+			signoff( ic );
 			return( 0 );
 		}
 		
-		if( g_strcasecmp( cmd[3], gc->username ) == 0 )
+		if( g_strcasecmp( cmd[3], ic->username ) == 0 )
 		{
 			set_t *s;
 			
 			http_decode( cmd[4] );
-			strncpy( gc->displayname, cmd[4], sizeof( gc->displayname ) );
-			gc->displayname[sizeof(gc->displayname)-1] = 0;
+			strncpy( ic->displayname, cmd[4], sizeof( ic->displayname ) );
+			ic->displayname[sizeof(ic->displayname)-1] = 0;
 			
-			if( ( s = set_find( &gc->acc->set, "display_name" ) ) )
+			if( ( s = set_find( &ic->acc->set, "display_name" ) ) )
 			{
 				g_free( s->value );
 				s->value = g_strdup( cmd[4] );
@@ -540,19 +540,19 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 		{
 			/* This is not supposed to happen, but let's handle it anyway... */
 			http_decode( cmd[4] );
-			serv_buddy_rename( gc, cmd[3], cmd[4] );
+			serv_buddy_rename( ic, cmd[3], cmd[4] );
 		}
 	}
 	else if( strcmp( cmd[0], "IPG" ) == 0 )
 	{
-		do_error_dialog( gc, "Received IPG command, we don't handle them yet.", "MSN" );
+		do_error_dialog( ic, "Received IPG command, we don't handle them yet.", "MSN" );
 		
 		md->handler->msglen = atoi( cmd[1] );
 		
 		if( md->handler->msglen <= 0 )
 		{
-			hide_login_progress_error( gc, "Syntax error" );
-			signoff( gc );
+			hide_login_progress_error( ic, "Syntax error" );
+			signoff( ic );
 			return( 0 );
 		}
 	}
@@ -562,11 +562,11 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 		const struct msn_status_code *err = msn_status_by_number( num );
 		
 		g_snprintf( buf, sizeof( buf ), "Error reported by MSN server: %s", err->text );
-		do_error_dialog( gc, buf, "MSN" );
+		do_error_dialog( ic, buf, "MSN" );
 		
 		if( err->flags & STATUS_FATAL )
 		{
-			signoff( gc );
+			signoff( ic );
 			return( 0 );
 		}
 	}
@@ -580,7 +580,7 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
 
 static int msn_ns_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts )
 {
-	struct gaim_connection *gc = data;
+	struct im_connection *ic = data;
 	char *body;
 	int blen = 0;
 	
@@ -616,7 +616,7 @@ static int msn_ns_message( gpointer data, char *msg, int msglen, char **cmd, int
 				if( mtype && strcmp( mtype, "1" ) == 0 )
 				{
 					if( arg1 )
-						serv_got_crap( gc, "The server is going down for maintenance in %s minutes.", arg1 );
+						serv_got_crap( ic, "The server is going down for maintenance in %s minutes.", arg1 );
 				}
 				
 				if( arg1 ) g_free( arg1 );
@@ -633,7 +633,7 @@ static int msn_ns_message( gpointer data, char *msg, int msglen, char **cmd, int
 				
 				if( inbox && folders )
 				{
-					serv_got_crap( gc, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
+					serv_got_crap( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
 				}
 			}
 			else if( g_strncasecmp( ct, "text/x-msmsgsemailnotification", 30 ) == 0 )
@@ -643,7 +643,7 @@ static int msn_ns_message( gpointer data, char *msg, int msglen, char **cmd, int
 				
 				if( from && fromname )
 				{
-					serv_got_crap( gc, "Received an e-mail message from %s <%s>.", fromname, from );
+					serv_got_crap( ic, "Received an e-mail message from %s <%s>.", fromname, from );
 				}
 			}
 			else if( g_strncasecmp( ct, "text/x-msmsgsactivemailnotification", 35 ) == 0 )
@@ -664,8 +664,8 @@ static int msn_ns_message( gpointer data, char *msg, int msglen, char **cmd, int
 
 static void msn_auth_got_passport_id( struct passport_reply *rep )
 {
-	struct gaim_connection *gc = rep->data;
-	struct msn_data *md = gc->proto_data;
+	struct im_connection *ic = rep->data;
+	struct msn_data *md = ic->proto_data;
 	char *key = rep->result;
 	char buf[1024];
 	
@@ -676,14 +676,14 @@ static void msn_auth_got_passport_id( struct passport_reply *rep )
 		err = g_strdup_printf( "Error during Passport authentication (%s)",
 		                       rep->error_string ? rep->error_string : "Unknown error" );
 		
-		hide_login_progress( gc, err );
-		signoff( gc );
+		hide_login_progress( ic, err );
+		signoff( ic );
 		
 		g_free( err );
 	}
 	else
 	{
 		g_snprintf( buf, sizeof( buf ), "USR %d TWN S %s\r\n", ++md->trId, key );
-		msn_write( gc, buf, strlen( buf ) );
+		msn_write( ic, buf, strlen( buf ) );
 	}
 }