Changeset e9caacd

Timestamp:

2012-09-16T18:08:15Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fe79de66

Parents:

79bb7e4

Message:

Don't accidentally create groupchats for 1:1 chats.

File:

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

protocols/msn/sb.c

@@ -455 +455 @@
                         char buf[1024];
                         
-                        if( num == 1 )
-                        {
-                                g_snprintf( buf, sizeof( buf ), "MSN groupchat session %d", sb->session );
-                                sb->chat = imcb_chat_new( ic, buf );
-                                
-                                g_free( sb->who );
-                                sb->who = NULL;
-                        }
-                        
                         /* For as much as I understand this MPOP stuff now, a
                            switchboard has two (or more) roster entries per
@@ -469 +460 @@
                            the latter. */
                         if( !strchr( cmd[4], ';' ) )
-                                imcb_chat_add_buddy( sb->chat, cmd[4] );
-                        
-                        if( num == tot )
+                        {
+                                /* HACK: Since even 1:1 chats now have >2 participants
+                                   (ourselves included) it gets hard to tell them apart
+                                   from rooms. Let's hope this is enough: */
+                                if( sb->chat == NULL && num != tot )
+                                {
+                                        g_snprintf( buf, sizeof( buf ), "MSN groupchat session %d", sb->session );
+                                        sb->chat = imcb_chat_new( ic, buf );
+                                        
+                                        g_free( sb->who );
+                                        sb->who = NULL;
+                                }
+                                
+                                if( sb->chat )
+                                        imcb_chat_add_buddy( sb->chat, cmd[4] );
+                        }
+                        
+                        /* We have the full roster, start showing the channel to
+                           the user. */
+                        if( num == tot && sb->chat )
                         {
                                 imcb_chat_add_buddy( sb->chat, ic->acc->user );