Changeset 75610c3

Timestamp:

2010-05-09T00:40:54Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

bd5eee3

Parents:

36577aa

Message:

Fixed up OSCAR to work with the new way of setting up groupchats.

File:

• protocols/oscar/oscar.c (modified) (2 diffs)

protocols/oscar/oscar.c

@@ -799 +799 @@
         chatcon = find_oscar_chat_by_conn(ic, fr->conn);
         chatcon->id = id;
-        chatcon->cnv = imcb_chat_new(ic, chatcon->show);
+        chatcon->cnv = bee_chat_by_title(ic->bee, ic, chatcon->show);
+        if (chatcon->cnv == NULL)
+                chatcon->cnv = imcb_chat_new(ic, chatcon->show);
         chatcon->cnv->data = chatcon;
 
@@ -2651 +2653 @@
         static int chat_id = 0;
         char * chatname;
-        
-        chatname = g_strdup_printf("%s%d", ic->acc->user, chat_id++);
-  
+        struct groupchat *c;
+        
+        chatname = g_strdup_printf("%s%s_%d", isdigit(*ic->acc->user) ? "icq_" : "",
+                                   ic->acc->user, chat_id++);
+        
+        c = imcb_chat_new(ic, chatname);
+
         ret = oscar_chat_join(ic, chatname, NULL, NULL);