Changeset e5abfd4

Timestamp:

2010-05-09T11:26:57Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

47fae0f

Parents:

bd5eee3

Message:

Safety check for yesterday's fixes: Double-check that a groupchat struct
isn't claimed already.

Location:

protocols

Files:

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

protocols/msn/sb.c

@@ -233 +233 @@
 {
         struct im_connection *ic = sb->ic;
+        struct groupchat *c = NULL;
         char buf[1024];
         
@@ -238 +239 @@
         g_snprintf( buf, sizeof( buf ), "MSN groupchat session %d", sb->session );
         if( sb->who )
-                sb->chat = bee_chat_by_title( ic->bee, ic, sb->who );
-        if( sb->chat == NULL )
+                c = bee_chat_by_title( ic->bee, ic, sb->who );
+        if( c && !msn_sb_by_chat( c ) )
+                sb->chat = c;
+        else
                 sb->chat = imcb_chat_new( ic, buf );
         

protocols/oscar/oscar.c

@@ -787 +787 @@
         struct im_connection *ic = sess->aux_data;
         struct chat_connection *chatcon;
+        struct groupchat *c = NULL;
         static int id = 1;
 
@@ -799 +800 @@
         chatcon = find_oscar_chat_by_conn(ic, fr->conn);
         chatcon->id = id;
-        chatcon->cnv = bee_chat_by_title(ic->bee, ic, chatcon->show);
-        if (chatcon->cnv == NULL)
+        
+        c = bee_chat_by_title(ic->bee, ic, chatcon->show);
+        if (c && !c->data)
+                chatcon->cnv = c;
+        else
                 chatcon->cnv = imcb_chat_new(ic, chatcon->show);
         chatcon->cnv->data = chatcon;