Changes in protocols/msn/msn.c [823de9d:c6ca3ee]

File:

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

protocols/msn/msn.c

@@ -26 +26 @@
 #include "nogaim.h"
 #include "msn.h"
+
+int msn_chat_id;
+GSList *msn_connections;
+GSList *msn_switchboards;
 
 static char *msn_set_display_name( set_t *set, char *value );
@@ -113 +117 @@
 {
         struct msn_switchboard *sb;
+        struct msn_data *md = ic->proto_data;
         
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
@@ -121 +126 @@
         {
                 struct msn_message *m;
+                char buf[1024];
                 
                 /* Create a message. We have to arrange a usable switchboard, and send the message later. */
@@ -127 +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 );
         }
         
@@ -217 +256 @@
 {
         struct msn_switchboard *sb;
+        struct msn_data *md = ic->proto_data;
+        char buf[1024];
         
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
@@ -226 +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 */
@@ -232 +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;
         }
@@ -317 +376 @@
         
         ret->name = "msn";
-    ret->mms = 1409;         /* this guess taken from libotr UPGRADING file */
         ret->login = msn_login;
         ret->init = msn_init;