Changeset 8e419cb for protocols/msn/sb.c

Timestamp:

2006-01-10T21:35:08Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

a4dc9f7

Parents:

3e91c3e (diff), dd8d4c5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge Wilmer

File:

• protocols/msn/sb.c (modified) (2 diffs)

protocols/msn/sb.c

@@ -512 +512 @@
         {
                 int num = atoi( cmd[0] );
-                struct msn_status_code *err = msn_status_by_number( num );
+                const struct msn_status_code *err = msn_status_by_number( num );
                 
                 g_snprintf( buf, sizeof( buf ), "Error reported by switchboard server: %s", err->text );
@@ -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;
+                        }
                 }
         }