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

File:

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

protocols/msn/sb.c

@@ -30 +30 @@
 #include "md5.h"
 
-static void msn_sb_callback( gpointer data, gint source, GaimInputCondition cond );
+static gboolean msn_sb_callback( gpointer data, gint source, b_input_condition 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 ) gaim_input_remove( sb->inp );
+        if( sb->inp ) b_event_remove( sb->inp );
         closesocket( sb->fd );
         
@@ -245 +245 @@
 }
 
-void msn_sb_connected( gpointer data, gint source, GaimInputCondition cond )
+gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond )
 {
         struct msn_switchboard *sb = data;
@@ -254 +254 @@
         /* Are we still alive? */
         if( !g_slist_find( msn_switchboards, sb ) )
-                return;
+                return FALSE;
         
         gc = sb->gc;
@@ -263 +263 @@
                 debug( "ERROR %d while connecting to switchboard server", 1 );
                 msn_sb_destroy( sb );
-                return;
+                return FALSE;
         }
         
@@ -280 +280 @@
         
         if( msn_sb_write( sb, buf, strlen( buf ) ) )
-                sb->inp = gaim_input_add( sb->fd, GAIM_INPUT_READ, msn_sb_callback, sb );
+                sb->inp = b_input_add( sb->fd, GAIM_INPUT_READ, msn_sb_callback, sb );
         else
                 debug( "ERROR %d while connecting to switchboard server", 2 );
-}
-
-static void msn_sb_callback( gpointer data, gint source, GaimInputCondition cond )
+        
+        return FALSE;
+}
+
+static gboolean msn_sb_callback( gpointer data, gint source, b_input_condition cond )
 {
         struct msn_switchboard *sb = data;
@@ -293 +295 @@
                 debug( "ERROR: Switchboard died" );
                 msn_sb_destroy( sb );
-        }
+                
+                return FALSE;
+        }
+        else
+                return TRUE;
 }