Changes in protocols/oscar/oscar.c [56699f0:3dc6d86]

File:

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

protocols/oscar/oscar.c

@@ -254 +254 @@
 
         u = t = g_strdup(s);
+
+        strcpy(t, s);
         g_strdown(t);
 
@@ -288 +290 @@
         odata = (struct oscar_data *)ic->proto_data;
 
-        if (condition & B_EV_IO_READ) {
+        if (condition & GAIM_INPUT_READ) {
                 if (aim_get_command(odata->sess, conn) >= 0) {
                         aim_rxdispatch(odata->sess);
@@ -360 +362 @@
 
         aim_conn_completeconnect(sess, conn);
-        ic->inpa = b_input_add(conn->fd, B_EV_IO_READ,
+        ic->inpa = b_input_add(conn->fd, GAIM_INPUT_READ,
                         oscar_callback, conn);
         
@@ -491 +493 @@
 
         aim_conn_completeconnect(sess, bosconn);
-        ic->inpa = b_input_add(bosconn->fd, B_EV_IO_READ,
+        ic->inpa = b_input_add(bosconn->fd, GAIM_INPUT_READ,
                         oscar_callback, bosconn);
         imcb_log(ic, _("Connection established, cookie sent"));
@@ -650 +652 @@
         struct im_connection *ic = sess->aux_data;
         struct chat_connection *chatcon;
-        struct groupchat *c = NULL;
         static int id = 1;
 
@@ -663 +664 @@
         chatcon = find_oscar_chat_by_conn(ic, fr->conn);
         chatcon->id = id;
-        
-        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 = imcb_chat_new(ic, chatcon->show);
         chatcon->cnv->data = chatcon;
 
@@ -707 +703 @@
 
         aim_conn_completeconnect(sess, tstconn);
-        odata->cnpa = b_input_add(tstconn->fd, B_EV_IO_READ,
+        odata->cnpa = b_input_add(tstconn->fd, GAIM_INPUT_READ,
                                         oscar_callback, tstconn);
         
@@ -735 +731 @@
 
         aim_conn_completeconnect(sess, tstconn);
-        odata->paspa = b_input_add(tstconn->fd, B_EV_IO_READ,
+        odata->paspa = b_input_add(tstconn->fd, GAIM_INPUT_READ,
                                 oscar_callback, tstconn);
         
@@ -771 +767 @@
         aim_conn_completeconnect(sess, ccon->conn);
         ccon->inpa = b_input_add(tstconn->fd,
-                        B_EV_IO_READ,
+                        GAIM_INPUT_READ,
                         oscar_callback, tstconn);
         odata->oscar_chats = g_slist_append(odata->oscar_chats, ccon);
@@ -938 +934 @@
         tmp = normalize(info->sn);
         imcb_buddy_status(ic, tmp, flags, state_string, NULL);
-        imcb_buddy_times(ic, tmp, signon, time_idle);
+        /* imcb_buddy_times(ic, tmp, signon, time_idle); */
 
 
@@ -1064 +1060 @@
         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);
@@ -1825 +1822 @@
         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)
@@ -1831 +1827 @@
                                 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);
@@ -1958 +1953 @@
 static int gaim_ssi_parselist(aim_session_t *sess, aim_frame_t *fr, ...) {
         struct im_connection *ic = sess->aux_data;
-        struct aim_ssi_item *curitem, *curgroup;
+        struct aim_ssi_item *curitem;
         int tmp;
         char *nrm;
@@ -1969 +1964 @@
                 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;
 
                                         if (curitem->data && aim_gettlv(curitem->data, 0x0131, 1))
                                                     realname = aim_gettlv_str(curitem->data, 0x0131, 1);
-                                        
-                                        imcb_add_buddy(ic, nrm, curgroup->gid == curitem->gid ? curgroup->name : NULL);
+                                                
+                                        imcb_add_buddy(ic, nrm, NULL);
                                         
                                         if (realname) {
@@ -1983 +1978 @@
                                         }
                                 }
-                                break;
-
-                        case 0x0001: /* Group */
-                                curgroup = curitem;
                                 break;
 
@@ -2529 +2520 @@
         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);
+
         aim_chat_invite(od->sess, od->conn, who, "", 4, chatname, 0x0);