Changes in protocols/oscar/oscar.c [75610c3:5a599a1]

File:

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

protocols/oscar/oscar.c

@@ -799 +799 @@
         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)
-                chatcon->cnv = imcb_chat_new(ic, chatcon->show);
+        chatcon->cnv = imcb_chat_new(ic, chatcon->show);
         chatcon->cnv->data = chatcon;
 
@@ -1192 +1190 @@
         aim_ssi_auth_reply(od->sess, od->conn, uin, 1, "");
         // aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message);
-        imcb_ask_add(data->ic, uin, NULL);
+        if(imcb_find_buddy(data->ic, uin) == NULL)
+                imcb_ask_add(data->ic, uin, NULL);
         
         g_free(uin);
@@ -1953 +1952 @@
         struct oscar_data *odata = (struct oscar_data *)g->proto_data;
         if (odata->icq) {
-                /** FIXME(wilmer): Hmm, lost the ability to get away msgs here, do we care to get that back?
                 struct buddy *budlight = imcb_find_buddy(g, who);
                 if (budlight)
@@ -1959 +1957 @@
                                 if (budlight->caps & AIM_CAPS_ICQSERVERRELAY)
                                         aim_send_im_ch2_geticqmessage(odata->sess, who, (budlight->uc & 0xff80) >> 7);
-                */
         } else
                 aim_getinfo(odata->sess, odata->conn, who, AIM_GETINFO_AWAYMESSAGE);
@@ -2097 +2094 @@
                 switch (curitem->type) {
                         case 0x0000: /* Buddy */
-                                if ((curitem->name) && (!imcb_buddy_by_handle(ic, nrm))) {
+                                if ((curitem->name) && (!imcb_find_buddy(ic, nrm))) {
                                         char *realname = NULL;
 
@@ -2653 +2650 @@
         static int chat_id = 0;
         char * chatname;
-        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);