Changes in protocols/oscar/oscar.c [5a599a1:75610c3]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/oscar/oscar.c
r5a599a1 r75610c3 799 799 chatcon = find_oscar_chat_by_conn(ic, fr->conn); 800 800 chatcon->id = id; 801 chatcon->cnv = imcb_chat_new(ic, chatcon->show); 801 chatcon->cnv = bee_chat_by_title(ic->bee, ic, chatcon->show); 802 if (chatcon->cnv == NULL) 803 chatcon->cnv = imcb_chat_new(ic, chatcon->show); 802 804 chatcon->cnv->data = chatcon; 803 805 … … 1190 1192 aim_ssi_auth_reply(od->sess, od->conn, uin, 1, ""); 1191 1193 // aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message); 1192 if(imcb_find_buddy(data->ic, uin) == NULL) 1193 imcb_ask_add(data->ic, uin, NULL); 1194 imcb_ask_add(data->ic, uin, NULL); 1194 1195 1195 1196 g_free(uin); … … 1952 1953 struct oscar_data *odata = (struct oscar_data *)g->proto_data; 1953 1954 if (odata->icq) { 1955 /** FIXME(wilmer): Hmm, lost the ability to get away msgs here, do we care to get that back? 1954 1956 struct buddy *budlight = imcb_find_buddy(g, who); 1955 1957 if (budlight) … … 1957 1959 if (budlight->caps & AIM_CAPS_ICQSERVERRELAY) 1958 1960 aim_send_im_ch2_geticqmessage(odata->sess, who, (budlight->uc & 0xff80) >> 7); 1961 */ 1959 1962 } else 1960 1963 aim_getinfo(odata->sess, odata->conn, who, AIM_GETINFO_AWAYMESSAGE); … … 2094 2097 switch (curitem->type) { 2095 2098 case 0x0000: /* Buddy */ 2096 if ((curitem->name) && (!imcb_ find_buddy(ic, nrm))) {2099 if ((curitem->name) && (!imcb_buddy_by_handle(ic, nrm))) { 2097 2100 char *realname = NULL; 2098 2101 … … 2650 2653 static int chat_id = 0; 2651 2654 char * chatname; 2655 struct groupchat *c; 2652 2656 2653 2657 chatname = g_strdup_printf("%s%s_%d", isdigit(*ic->acc->user) ? "icq_" : "", 2654 2658 ic->acc->user, chat_id++); 2655 2659 2660 c = imcb_chat_new(ic, chatname); 2661 2656 2662 ret = oscar_chat_join(ic, chatname, NULL, NULL); 2657 2663
Note: See TracChangeset
for help on using the changeset viewer.