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

File:

• protocols/msn/sb.c (modified) (9 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 );
@@ -122 +122 @@
         if( sb->ready )
         {
-                char cmd[1024], *buf;
+                char *packet, *buf;
                 int i, j;
                 
+                /* Build the message. Convert LF to CR-LF for normal messages. */
                 if( strcmp( text, TYPING_NOTIFICATION_MESSAGE ) != 0 )
                 {
@@ -142 +143 @@
                 {
                         i = strlen( MSN_TYPING_HEADERS ) + strlen( sb->gc->username );
-                        buf = g_new0( char, strlen( MSN_TYPING_HEADERS ) + strlen( sb->gc->username ) );
+                        buf = g_new0( char, i );
                         i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->gc->username );
                 }
                 
-                g_snprintf( cmd, sizeof( cmd ), "MSG %d N %d\r\n", ++sb->trId, i );
-                if( msn_sb_write( sb, cmd, strlen( cmd ) ) && msn_sb_write( sb, buf, i ) )
-                {
-                        g_free( buf );
+                /* Build the final packet (MSG command + the message). */
+                packet = g_strdup_printf( "MSG %d N %d\r\n%s", ++sb->trId, i, buf );
+                g_free( buf );
+                if( msn_sb_write( sb, packet, strlen( packet ) ) )
+                {
+                        g_free( packet );
                         return( 1 );
                 }
                 else
                 {
-                        g_free( buf );
+                        g_free( packet );
                         return( 0 );
                 }
@@ -237 +240 @@
         }
         
-        if( sb->inp ) gaim_input_remove( sb->inp );
+        if( sb->inp ) b_event_remove( sb->inp );
         closesocket( sb->fd );
         
@@ -245 +248 @@
 }
 
-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 +257 @@
         /* Are we still alive? */
         if( !g_slist_find( msn_switchboards, sb ) )
-                return;
+                return FALSE;
         
         gc = sb->gc;
@@ -263 +266 @@
                 debug( "ERROR %d while connecting to switchboard server", 1 );
                 msn_sb_destroy( sb );
-                return;
+                return FALSE;
         }
         
@@ -280 +283 @@
         
         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 +298 @@
                 debug( "ERROR: Switchboard died" );
                 msn_sb_destroy( sb );
-        }
+                
+                return FALSE;
+        }
+        else
+                return TRUE;
 }