Changeset 4ff0966 for protocols/msn/sb.c

Timestamp:

2006-05-28T23:13:47Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

df417ca

Parents:

cdca30b (diff), 79b6213 (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:

Merging from main/jelmer.

File:

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

protocols/msn/sb.c

@@ -529 +529 @@
                 {
                         msn_sb_destroy( sb );
-                        return( 0 );
-                }
-                if( err->flags & STATUS_FATAL )
+                        return 0;
+                }
+                else if( err->flags & STATUS_FATAL )
                 {
                         signoff( gc );
-                        return( 0 );
-                }
-                if( err->flags & STATUS_SB_IM_SPARE )
+                        return 0;
+                }
+                else if( err->flags & STATUS_SB_IM_SPARE )
                 {
                         if( sb->who )
@@ -559 +559 @@
                                 sb->msgq = NULL;
                         }
+                        
+                        /* Do NOT return 0 here, we want to keep this sb. */
                 }
         }