Changes in protocols/msn/msn.c [17a6ee9:c6ca3ee]

File:

• protocols/msn/msn.c (modified) (10 diffs)

protocols/msn/msn.c

@@ -81 +81 @@
         if( md )
         {
-                /** Disabling MSN ft support for now.
-                while( md->filetransfers ) {
-                        imcb_file_canceled( md->filetransfers->data, "Closing connection" );
-                }
-                */
-                
                 if( md->fd >= 0 )
                         closesocket( md->fd );
@@ -123 +117 @@
 {
         struct msn_switchboard *sb;
+        struct msn_data *md = ic->proto_data;
         
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
@@ -131 +126 @@
         {
                 struct msn_message *m;
+                char buf[1024];
                 
                 /* Create a message. We have to arrange a usable switchboard, and send the message later. */
@@ -137 +133 @@
                 m->text = g_strdup( message );
                 
-                return msn_sb_write_msg( ic, m );
+                /* FIXME: *CHECK* the reliability of using spare sb's! */
+                if( ( sb = msn_sb_spare( ic ) ) )
+                {
+                        debug( "Trying to use a spare switchboard to message %s", who );
+                        
+                        sb->who = g_strdup( who );
+                        g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, who );
+                        if( msn_sb_write( sb, buf, strlen( buf ) ) )
+                        {
+                                /* He/She should join the switchboard soon, let's queue the message. */
+                                sb->msgq = g_slist_append( sb->msgq, m );
+                                return( 1 );
+                        }
+                }
+                
+                debug( "Creating a new switchboard to message %s", who );
+                
+                /* If we reach this line, there was no spare switchboard, so let's make one. */
+                g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
+                if( !msn_write( ic, buf, strlen( buf ) ) )
+                {
+                        g_free( m->who );
+                        g_free( m->text );
+                        g_free( m );
+                        
+                        return( 0 );
+                }
+                
+                /* And queue the message to md. We'll pick it up when the switchboard comes up. */
+                md->msgq = g_slist_append( md->msgq, m );
+                
+                /* FIXME: If the switchboard creation fails, the message will not be sent. */
+                
+                return( 1 );
         }
         
@@ -149 +178 @@
         
         if( l == NULL )
-                for( i = 0; *msn_away_state_list[i].code; i ++ )
-                        if( *msn_away_state_list[i].name )
-                                l = g_list_append( l, (void*) msn_away_state_list[i].name );
+                for( i = 0; msn_away_state_list[i].number > -1; i ++ )
+                        l = g_list_append( l, (void*) msn_away_state_list[i].name );
         
         return l;
@@ -160 +188 @@
         char buf[1024];
         struct msn_data *md = ic->proto_data;
-        
-        if( state )
-                md->away_state = msn_away_state_by_name( state ) ? :
-                                 msn_away_state_list + 1;
+        const struct msn_away_state *st;
+        
+        if( strcmp( state, GAIM_AWAY_CUSTOM ) == 0 )
+                st = msn_away_state_by_name( "Away" );
         else
-                md->away_state = msn_away_state_list;
-        
-        g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, md->away_state->code );
+                st = msn_away_state_by_name( state );
+        
+        if( !st ) st = msn_away_state_list;
+        md->away_state = st;
+        
+        g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, st->code );
         msn_write( ic, buf, strlen( buf ) );
 }
@@ -225 +256 @@
 {
         struct msn_switchboard *sb;
+        struct msn_data *md = ic->proto_data;
+        char buf[1024];
         
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
@@ -234 +267 @@
         {
                 struct msn_message *m;
+                
+                if( ( sb = msn_sb_spare( ic ) ) )
+                {
+                        debug( "Trying to reuse an existing switchboard as a groupchat with %s", who );
+                        g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, who );
+                        if( msn_sb_write( sb, buf, strlen( buf ) ) )
+                                return msn_sb_to_chat( sb );
+                }
+                
+                /* If the stuff above failed for some reason: */
+                debug( "Creating a new switchboard to groupchat with %s", who );
+                
+                /* Request a new switchboard. */
+                g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
+                if( !msn_write( ic, buf, strlen( buf ) ) )
+                        return( 0 );
                 
                 /* Create a magic message. This is quite hackish, but who cares? :-P */
@@ -240 +289 @@
                 m->text = g_strdup( GROUPCHAT_SWITCHBOARD_MESSAGE );
                 
-                msn_sb_write_msg( ic, m );
-
+                /* Queue the magic message and cross your fingers. */
+                md->msgq = g_slist_append( md->msgq, m );
+                
+                /* FIXME: Can I try to return something here already? */
                 return NULL;
         }
@@ -346 +397 @@
         ret->send_typing = msn_send_typing;
         ret->handle_cmp = g_strcasecmp;
-        //ret->transfer_request = msn_ftp_transfer_request;
 
         register_protocol(ret);