Changes in protocols/msn/msn.c [c6ca3ee:9bf2481]

File:

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

protocols/msn/msn.c

@@ -41 +41 @@
 
         s = set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
+        
+        s = set_add( &acc->set, "switchboard_keepalives", "false", set_eval_bool, acc );
 }
 
@@ -117 +119 @@
 {
         struct msn_switchboard *sb;
-        struct msn_data *md = ic->proto_data;
         
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
@@ -126 +127 @@
         {
                 struct msn_message *m;
-                char buf[1024];
                 
                 /* Create a message. We have to arrange a usable switchboard, and send the message later. */
@@ -133 +133 @@
                 m->text = g_strdup( message );
                 
-                /* 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 );
+                return msn_sb_write_msg( ic, m );
         }
         
@@ -178 +145 @@
         
         if( l == NULL )
-                for( i = 0; msn_away_state_list[i].number > -1; i ++ )
-                        l = g_list_append( l, (void*) msn_away_state_list[i].name );
+                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 );
         
         return l;
@@ -188 +156 @@
         char buf[1024];
         struct msn_data *md = ic->proto_data;
-        const struct msn_away_state *st;
-        
-        if( strcmp( state, GAIM_AWAY_CUSTOM ) == 0 )
-                st = msn_away_state_by_name( "Away" );
+        
+        if( state )
+                md->away_state = msn_away_state_by_name( state ) ? :
+                                 msn_away_state_list + 1;
         else
-                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 );
+                md->away_state = msn_away_state_list;
+        
+        g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, md->away_state->code );
         msn_write( ic, buf, strlen( buf ) );
 }
@@ -256 +221 @@
 {
         struct msn_switchboard *sb;
-        struct msn_data *md = ic->proto_data;
-        char buf[1024];
         
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
@@ -267 +230 @@
         {
                 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 */
@@ -289 +236 @@
                 m->text = g_strdup( GROUPCHAT_SWITCHBOARD_MESSAGE );
                 
-                /* 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? */
+                msn_sb_write_msg( ic, m );
+
                 return NULL;
         }