Changeset 3b9390b

Timestamp:

2005-12-18T10:39:13Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

578d627

Parents:

43f205b

Message:

When trying to talk to MSN people who are offline, the switchboard gets reset to a spare correctly.
This fixes a problem with messages to MSN people not arriving sometimes.

Location:

protocols/msn

Files:

• msn.h (modified) (1 diff)
• sb.c (modified) (1 diff)
• tables.c (modified) (2 diffs)

protocols/msn/msn.h

@@ -127 +127 @@
 #define STATUS_FATAL            1
 #define STATUS_SB_FATAL         2
+#define STATUS_SB_IM_SPARE      4       /* Make one-to-one conversation switchboard available again, invite failed. */
+#define STATUS_SB_CHAT_SPARE    8       /* Same, but also for groupchats (not used yet). */
 
 int msn_chat_id;

protocols/msn/sb.c

@@ -522 +522 @@
                         return( 0 );
                 }
-                else if( err->flags & STATUS_FATAL )
+                if( err->flags & STATUS_FATAL )
                 {
                         signoff( gc );
                         return( 0 );
+                }
+                if( err->flags & STATUS_SB_IM_SPARE )
+                {
+                        if( sb->who )
+                        {
+                                struct msn_message *m;
+                                GSList *l;
+                                
+                                /* Apparently some invitation failed. We might want to use this
+                                   board later, so keep it as a spare. */
+                                g_free( sb->who );
+                                sb->who = NULL;
+                                
+                                /* Also clear the msgq, otherwise someone else might get them. */
+                                for( l = sb->msgq; l; l = l->next )
+                                {
+                                        m = l->data;
+                                        g_free( m->who );
+                                        g_free( m->text );
+                                        g_free( m );
+                                }
+                                g_slist_free( sb->msgq );
+                                sb->msgq = NULL;
+                        }
                 }
         }

protocols/msn/tables.c

@@ -80 +80 @@
         { 206, "Domain name missing",                                   0 },
         { 207, "Already logged in",                                     0 },
-        { 208, "Invalid handle",                                        0 },
+        { 208, "Invalid handle",                                        STATUS_SB_IM_SPARE },
         { 209, "Forbidden nickname",                                    0 },
         { 210, "Buddy list too long",                                   0 },
         { 215, "Handle is already in list",                             0 },
-        { 216, "Handle is not in list",                                 0 },
-        { 217, "Person is off-line or non-existent",                    0 },
+        { 216, "Handle is not in list",                                 STATUS_SB_IM_SPARE },
+        { 217, "Person is off-line or non-existent",                    STATUS_SB_IM_SPARE },
         { 218, "Already in that mode",                                  0 },
         { 219, "Handle is already in opposite list",                    0 },
@@ -118 +118 @@
         { 711, "Write is blocking",                                     STATUS_FATAL },
         { 712, "Session is overloaded",                                 STATUS_FATAL },
-        { 713, "Calling too rapidly",                                   0 },
+        { 713, "Calling too rapidly",                                   STATUS_SB_IM_SPARE },
         { 714, "Too many sessions",                                     STATUS_FATAL },
         { 715, "Not expected/Invalid argument/action",                  0 },