Changes in protocols/msn/sb.c [ba9edaa:6048744]

File:

• protocols/msn/sb.c (modified) (9 diffs)

protocols/msn/sb.c

@@ -30 +30 @@
 #include "md5.h"
 
-static gboolean msn_sb_callback( gpointer data, gint source, b_input_condition cond );
+static void msn_sb_callback( gpointer data, gint source, GaimInputCondition cond );
 static int msn_sb_command( gpointer data, char **cmd, int num_parts );
 static int msn_sb_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts );
@@ -237 +237 @@
         }
         
-        if( sb->inp ) b_event_remove( sb->inp );
+        if( sb->inp ) gaim_input_remove( sb->inp );
         closesocket( sb->fd );
         
@@ -245 +245 @@
 }
 
-gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond )
+void msn_sb_connected( gpointer data, gint source, GaimInputCondition cond )
 {
         struct msn_switchboard *sb = data;
@@ -254 +254 @@
         /* Are we still alive? */
         if( !g_slist_find( msn_switchboards, sb ) )
-                return FALSE;
+                return;
         
         gc = sb->gc;
@@ -263 +263 @@
                 debug( "ERROR %d while connecting to switchboard server", 1 );
                 msn_sb_destroy( sb );
-                return FALSE;
+                return;
         }
         
@@ -280 +280 @@
         
         if( msn_sb_write( sb, buf, strlen( buf ) ) )
-                sb->inp = b_input_add( sb->fd, GAIM_INPUT_READ, msn_sb_callback, sb );
+                sb->inp = gaim_input_add( sb->fd, GAIM_INPUT_READ, msn_sb_callback, sb );
         else
                 debug( "ERROR %d while connecting to switchboard server", 2 );
-        
-        return FALSE;
-}
-
-static gboolean msn_sb_callback( gpointer data, gint source, b_input_condition cond )
+}
+
+static void msn_sb_callback( gpointer data, gint source, GaimInputCondition cond )
 {
         struct msn_switchboard *sb = data;
@@ -295 +293 @@
                 debug( "ERROR: Switchboard died" );
                 msn_sb_destroy( sb );
-                
-                return FALSE;
-        }
-        else
-                return TRUE;
+        }
 }
 
@@ -529 +523 @@
                 {
                         msn_sb_destroy( sb );
-                        return( 0 );
-                }
-                if( err->flags & STATUS_FATAL )
+                        return 0;
+                }
+                else if( err->flags & STATUS_FATAL )
                 {
                         signoff( gc );
-                        return( 0 );
-                }
-                if( err->flags & STATUS_SB_IM_SPARE )
+                        return 0;
+                }
+                else if( err->flags & STATUS_SB_IM_SPARE )
                 {
                         if( sb->who )
@@ -559 +553 @@
                                 sb->msgq = NULL;
                         }
+                        
+                        /* Do NOT return 0 here, we want to keep this sb. */
                 }
         }