Changeset 36577aa

Timestamp:

2010-05-09T00:28:38Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

75610c3

Parents:

eb37735

Message:

Create the struct groupchat early on in msn_chat_with() so the new chat
setup method works properly.

Location:

protocols/msn

Files:

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

protocols/msn/msn.c

@@ -223 +223 @@
 {
         struct msn_switchboard *sb;
+        struct groupchat *c = imcb_chat_new( ic, who );
         
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
@@ -240 +241 @@
                 msn_sb_write_msg( ic, m );
 
-                return NULL;
-        }
-        
-        return NULL;
+                return c;
+        }
 }
 

protocols/msn/sb.c

@@ -237 +237 @@
         /* Create the groupchat structure. */
         g_snprintf( buf, sizeof( buf ), "MSN groupchat session %d", sb->session );
-        sb->chat = imcb_chat_new( ic, buf );
+        if( sb->who )
+                sb->chat = bee_chat_by_title( ic->bee, ic, sb->who );
+        if( sb->chat == NULL )
+                sb->chat = imcb_chat_new( ic, buf );
         
         /* Populate the channel. */