Changeset 7989d40d

Timestamp:

2010-07-24T14:19:44Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

40e6dac

Parents:

03f3828

Message:

Fixing chat_join() for OSCAR to return a struct groupchat* right away,
without this we end up creating a #chat_000.

File:

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

protocols/oscar/oscar.c

@@ -2510 +2510 @@
 {
         struct oscar_data * od = (struct oscar_data *)ic->proto_data;
+        struct groupchat *ret = imcb_chat_new(ic, room);
         aim_conn_t * cur;
 
@@ -2517 +2518 @@
                 st = aim_chatnav_createroom(od->sess, cur, room, exchange_number);
                 
-                return NULL;
+                return ret;
         } else {
                 struct create_room * cr = g_new0(struct create_room, 1);
@@ -2526 +2527 @@
                 aim_reqservice(od->sess, od->conn, AIM_CONN_TYPE_CHATNAV);
                 
-                return NULL;
+                return ret;
         }
 }