Index: protocols/msn/ns.c
===================================================================
--- protocols/msn/ns.c	(revision c2fb38096ea4e75a680e57e103d4a4986aa84c75)
+++ protocols/msn/ns.c	(revision 84b045d409f1e8da6d8bf379c6fef7236dcd9bcd)
@@ -47,5 +47,5 @@
 	if( source == -1 )
 	{
-		imc_error( ic, "Could not connect to server" );
+		imcb_error( ic, "Could not connect to server" );
 		imc_logout( ic, TRUE );
 		return FALSE;
@@ -76,5 +76,5 @@
 	{
 		ic->inpa = b_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, ic );
-		imc_log( ic, "Connected to server, waiting for reply" );
+		imcb_log( ic, "Connected to server, waiting for reply" );
 	}
 	
@@ -89,5 +89,5 @@
 	if( msn_handler( md->handler ) == -1 ) /* Don't do this on ret == 0, it's already done then. */
 	{
-		imc_error( ic, "Error while reading from server" );
+		imcb_error( ic, "Error while reading from server" );
 		imc_logout( ic, TRUE );
 		
@@ -114,5 +114,5 @@
 		if( cmd[2] && strncmp( cmd[2], "MSNP8", 5 ) != 0 )
 		{
-			imc_error( ic, "Unsupported protocol" );
+			imcb_error( ic, "Unsupported protocol" );
 			imc_logout( ic, FALSE );
 			return( 0 );
@@ -143,5 +143,5 @@
 			if( !server )
 			{
-				imc_error( ic, "Syntax error" );
+				imcb_error( ic, "Syntax error" );
 				imc_logout( ic, TRUE );
 				return( 0 );
@@ -151,5 +151,5 @@
 			server = cmd[3];
 			
-			imc_log( ic, "Transferring to other server" );
+			imcb_log( ic, "Transferring to other server" );
 			
 			md->fd = proxy_connect( server, port, msn_ns_connected, ic );
@@ -162,5 +162,5 @@
 			if( !server )
 			{
-				imc_error( ic, "Syntax error" );
+				imcb_error( ic, "Syntax error" );
 				imc_logout( ic, TRUE );
 				return( 0 );
@@ -172,5 +172,5 @@
 			if( strcmp( cmd[4], "CKI" ) != 0 )
 			{
-				imc_error( ic, "Unknown authentication method for switchboard" );
+				imcb_error( ic, "Unknown authentication method for switchboard" );
 				imc_logout( ic, TRUE );
 				return( 0 );
@@ -204,5 +204,5 @@
 		else
 		{
-			imc_error( ic, "Syntax error" );
+			imcb_error( ic, "Syntax error" );
 			imc_logout( ic, TRUE );
 			return( 0 );
@@ -216,5 +216,5 @@
 			if( !passport_get_id( msn_auth_got_passport_id, ic, ic->acc->user, ic->acc->pass, cmd[4] ) )
 			{
-				imc_error( ic, "Error while contacting Passport server" );
+				imcb_error( ic, "Error while contacting Passport server" );
 				imc_logout( ic, TRUE );
 				return( 0 );
@@ -236,5 +236,5 @@
 			}
 			
-			imc_log( ic, "Authenticated, getting buddy list" );
+			imcb_log( ic, "Authenticated, getting buddy list" );
 			
 			g_snprintf( buf, sizeof( buf ), "SYN %d 0\r\n", ++md->trId );
@@ -243,5 +243,5 @@
 		else
 		{
-			imc_error( ic, "Unknown authentication type" );
+			imcb_error( ic, "Unknown authentication type" );
 			imc_logout( ic, FALSE );
 			return( 0 );
@@ -252,5 +252,5 @@
 		if( num_parts != 4 )
 		{
-			imc_error( ic, "Syntax error" );
+			imcb_error( ic, "Syntax error" );
 			imc_logout( ic, TRUE );
 			return( 0 );
@@ -261,5 +261,5 @@
 		if( md->handler->msglen <= 0 )
 		{
-			imc_error( ic, "Syntax error" );
+			imcb_error( ic, "Syntax error" );
 			imc_logout( ic, TRUE );
 			return( 0 );
@@ -292,5 +292,5 @@
 		if( num_parts != 4 && num_parts != 5 )
 		{
-			imc_error( ic, "Syntax error" );
+			imcb_error( ic, "Syntax error" );
 			imc_logout( ic, TRUE );
 			return( 0 );
@@ -328,5 +328,5 @@
 			if( ic->flags & OPT_LOGGED_IN )
 			{
-				imc_log( ic, "Successfully transferred to different server" );
+				imcb_log( 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( ic, buf, strlen( buf ) ) );
@@ -344,5 +344,5 @@
 		if( num_parts != 4 )
 		{
-			imc_error( ic, "Syntax error" );
+			imcb_error( ic, "Syntax error" );
 			imc_logout( ic, TRUE );
 			return( 0 );
@@ -363,5 +363,5 @@
 		if( num_parts != 3 )
 		{
-			imc_error( ic, "Syntax error" );
+			imcb_error( ic, "Syntax error" );
 			imc_logout( ic, TRUE );
 			return( 0 );
@@ -385,5 +385,5 @@
 		if( num_parts != 6 )
 		{
-			imc_error( ic, "Syntax error" );
+			imcb_error( ic, "Syntax error" );
 			imc_logout( ic, TRUE );
 			return( 0 );
@@ -413,5 +413,5 @@
 		if( num_parts != 5 )
 		{
-			imc_error( ic, "Syntax error" );
+			imcb_error( ic, "Syntax error" );
 			imc_logout( ic, TRUE );
 			return( 0 );
@@ -438,5 +438,5 @@
 		if( num_parts != 7 )
 		{
-			imc_error( ic, "Syntax error" );
+			imcb_error( ic, "Syntax error" );
 			imc_logout( ic, TRUE );
 			return( 0 );
@@ -448,5 +448,5 @@
 		if( !server )
 		{
-			imc_error( ic, "Syntax error" );
+			imcb_error( ic, "Syntax error" );
 			imc_logout( ic, TRUE );
 			return( 0 );
@@ -458,5 +458,5 @@
 		if( strcmp( cmd[3], "CKI" ) != 0 )
 		{
-			imc_error( ic, "Unknown authentication method for switchboard" );
+			imcb_error( ic, "Unknown authentication method for switchboard" );
 			imc_logout( ic, TRUE );
 			return( 0 );
@@ -478,5 +478,5 @@
 			if( strchr( cmd[4], '@' ) == NULL )
 			{
-				imc_error( ic, "Syntax error" );
+				imcb_error( ic, "Syntax error" );
 				imc_logout( ic, TRUE );
 				return( 0 );
@@ -501,14 +501,14 @@
 		if( cmd[1] && strcmp( cmd[1], "OTH" ) == 0 )
 		{
-			imc_error( ic, "Someone else logged in with your account" );
+			imcb_error( ic, "Someone else logged in with your account" );
 			allow_reconnect = FALSE;
 		}
 		else if( cmd[1] && strcmp( cmd[1], "SSD" ) == 0 )
 		{
-			imc_error( ic, "Terminating session because of server shutdown" );
+			imcb_error( ic, "Terminating session because of server shutdown" );
 		}
 		else
 		{
-			imc_error( ic, "Session terminated by remote server (reason unknown)" );
+			imcb_error( ic, "Session terminated by remote server (reason unknown)" );
 		}
 		
@@ -520,5 +520,5 @@
 		if( num_parts != 5 )
 		{
-			imc_error( ic, "Syntax error" );
+			imcb_error( ic, "Syntax error" );
 			imc_logout( ic, TRUE );
 			return( 0 );
@@ -548,5 +548,5 @@
 	else if( strcmp( cmd[0], "IPG" ) == 0 )
 	{
-		imc_error( ic, "Received IPG command, we don't handle them yet." );
+		imcb_error( ic, "Received IPG command, we don't handle them yet." );
 		
 		md->handler->msglen = atoi( cmd[1] );
@@ -554,5 +554,5 @@
 		if( md->handler->msglen <= 0 )
 		{
-			imc_error( ic, "Syntax error" );
+			imcb_error( ic, "Syntax error" );
 			imc_logout( ic, TRUE );
 			return( 0 );
@@ -564,5 +564,5 @@
 		const struct msn_status_code *err = msn_status_by_number( num );
 		
-		imc_error( ic, "Error reported by MSN server: %s", err->text );
+		imcb_error( ic, "Error reported by MSN server: %s", err->text );
 		
 		if( err->flags & STATUS_FATAL )
@@ -618,5 +618,5 @@
 				{
 					if( arg1 )
-						imc_log( ic, "The server is going down for maintenance in %s minutes.", arg1 );
+						imcb_log( ic, "The server is going down for maintenance in %s minutes.", arg1 );
 				}
 				
@@ -635,5 +635,5 @@
 				if( inbox && folders )
 				{
-					imc_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
+					imcb_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
 				}
 			}
@@ -645,5 +645,5 @@
 				if( from && fromname )
 				{
-					imc_log( ic, "Received an e-mail message from %s <%s>.", fromname, from );
+					imcb_log( ic, "Received an e-mail message from %s <%s>.", fromname, from );
 				}
 			}
@@ -673,5 +673,5 @@
 	if( key == NULL )
 	{
-		imc_error( ic, "Error during Passport authentication (%s)",
+		imcb_error( ic, "Error during Passport authentication (%s)",
 		               rep->error_string ? rep->error_string : "Unknown error" );
 		imc_logout( ic, TRUE );
