Changes in protocols/msn/ns.c [ba9edaa:a2582c8]

File:

• protocols/msn/ns.c (modified) (8 diffs)

protocols/msn/ns.c

@@ -30 +30 @@
 #include "md5.h"
 
-static gboolean msn_ns_callback( gpointer data, gint source, b_input_condition cond );
+static void msn_ns_callback( gpointer data, gint source, GaimInputCondition cond );
 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 );
@@ -36 +36 @@
 static void msn_auth_got_passport_id( struct passport_reply *rep );
 
-gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond )
+void msn_ns_connected( gpointer data, gint source, GaimInputCondition cond )
 {
         struct gaim_connection *gc = data;
@@ -43 +43 @@
         
         if( !g_slist_find( msn_connections, gc ) )
-                return FALSE;
+                return;
         
         if( source == -1 )
@@ -49 +49 @@
                 hide_login_progress( gc, "Could not connect to server" );
                 signoff( gc );
-                return FALSE;
+                return;
         }
         
@@ -75 +75 @@
         if( msn_write( gc, s, strlen( s ) ) )
         {
-                gc->inpa = b_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, gc );
+                gc->inpa = gaim_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, gc );
                 set_login_progress( gc, 1, "Connected to server, waiting for reply" );
         }
-        
-        return FALSE;
 }
 
-static gboolean msn_ns_callback( gpointer data, gint source, b_input_condition cond )
+void msn_ns_callback( gpointer data, gint source, GaimInputCondition cond )
 {
         struct gaim_connection *gc = data;
@@ -91 +89 @@
                 hide_login_progress( gc, "Error while reading from server" );
                 signoff( gc );
-                
-                return FALSE;
-        }
-        else
-                return TRUE;
+        }
 }
 
@@ -136 +130 @@
                 if( num_parts == 6 && strcmp( cmd[2], "NS" ) == 0 )
                 {
-                        b_event_remove( gc->inpa );
+                        gaim_input_remove( gc->inpa );
                         gc->inpa = 0;
                         closesocket( md->fd );
@@ -656 +650 @@
         if( key == NULL )
         {
-                hide_login_progress( gc, "Error during Passport authentication" );
+                char *err;
+                
+                err = g_strdup_printf( "Error during Passport authentication (%s)",
+                                       rep->error_string ? rep->error_string : "Unknown error" );
+                
+                hide_login_progress( gc, err );
                 signoff( gc );
+                
+                g_free( err );
         }
         else