Changeset 2945c6f for protocols/oscar/oscar.c

Timestamp:

2010-07-24T21:16:18Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f1f7b5e

Parents:

ef14a83 (diff), 593971d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge ui-fix (which includes killerbee (i.e. file transfers and libpurple
support)). ui-fix rewrites the complete IRC core, fixing many things that
were broken/hacky/limited so far.

The list is too long to include here, but ​http://wiki.bitlbee.org/UiFix
has a summary, as does doc/CHANGES and of course the full revision history.

File:

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

protocols/oscar/oscar.c

@@ -254 +254 @@
 
         u = t = g_strdup(s);
-
-        strcpy(t, s);
         g_strdown(t);
 
@@ -290 +288 @@
         odata = (struct oscar_data *)ic->proto_data;
 
-        if (condition & GAIM_INPUT_READ) {
+        if (condition & B_EV_IO_READ) {
                 if (aim_get_command(odata->sess, conn) >= 0) {
                         aim_rxdispatch(odata->sess);
@@ -362 +360 @@
 
         aim_conn_completeconnect(sess, conn);
-        ic->inpa = b_input_add(conn->fd, GAIM_INPUT_READ,
+        ic->inpa = b_input_add(conn->fd, B_EV_IO_READ,
                         oscar_callback, conn);
         
@@ -493 +491 @@
 
         aim_conn_completeconnect(sess, bosconn);
-        ic->inpa = b_input_add(bosconn->fd, GAIM_INPUT_READ,
+        ic->inpa = b_input_add(bosconn->fd, B_EV_IO_READ,
                         oscar_callback, bosconn);
         imcb_log(ic, _("Connection established, cookie sent"));
@@ -652 +650 @@
         struct im_connection *ic = sess->aux_data;
         struct chat_connection *chatcon;
+        struct groupchat *c = NULL;
         static int id = 1;
 
@@ -664 +663 @@
         chatcon = find_oscar_chat_by_conn(ic, fr->conn);
         chatcon->id = id;
-        chatcon->cnv = imcb_chat_new(ic, chatcon->show);
+        
+        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->data = chatcon;
 
@@ -703 +707 @@
 
         aim_conn_completeconnect(sess, tstconn);
-        odata->cnpa = b_input_add(tstconn->fd, GAIM_INPUT_READ,
+        odata->cnpa = b_input_add(tstconn->fd, B_EV_IO_READ,
                                         oscar_callback, tstconn);
         
@@ -731 +735 @@
 
         aim_conn_completeconnect(sess, tstconn);
-        odata->paspa = b_input_add(tstconn->fd, GAIM_INPUT_READ,
+        odata->paspa = b_input_add(tstconn->fd, B_EV_IO_READ,
                                 oscar_callback, tstconn);
         
@@ -767 +771 @@
         aim_conn_completeconnect(sess, ccon->conn);
         ccon->inpa = b_input_add(tstconn->fd,
-                        GAIM_INPUT_READ,
+                        B_EV_IO_READ,
                         oscar_callback, tstconn);
         odata->oscar_chats = g_slist_append(odata->oscar_chats, ccon);
@@ -934 +938 @@
         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);
 
 
@@ -1060 +1064 @@
         aim_ssi_auth_reply(od->sess, od->conn, uin, 1, "");
         // aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message);
-        if(imcb_find_buddy(data->ic, uin) == NULL)
-                imcb_ask_add(data->ic, uin, NULL);
+        imcb_ask_add(data->ic, uin, NULL);
         
         g_free(uin);
@@ -1822 +1825 @@
         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)
@@ -1827 +1831 @@
                                 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);
@@ -1953 +1958 @@
 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;
+        struct aim_ssi_item *curitem, *curgroup;
         int tmp;
         char *nrm;
@@ -1964 +1969 @@
                 switch (curitem->type) {
                         case 0x0000: /* Buddy */
-                                if ((curitem->name) && (!imcb_find_buddy(ic, nrm))) {
+                                if ((curitem->name) && (!imcb_buddy_by_handle(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, NULL);
+                                        
+                                        imcb_add_buddy(ic, nrm, curgroup->gid == curitem->gid ? curgroup->name : NULL);
                                         
                                         if (realname) {
@@ -1978 +1983 @@
                                         }
                                 }
+                                break;
+
+                        case 0x0001: /* Group */
+                                curgroup = curitem;
                                 break;
 
@@ -2422 +2431 @@
         char *s;
         
-        ccon = c->data;
+        if (!(ccon = c->data))
+                return;
                 
         for (s = message; *s; s++)
@@ -2463 +2473 @@
         struct im_connection *ic = c->ic;
         struct oscar_data * od = (struct oscar_data *)ic->proto_data;
-        struct chat_connection *ccon = c->data;
+        struct chat_connection *ccon;
+        
+        if (!(ccon = c->data))
+                return;
         
         aim_chat_invite(od->sess, od->conn, who, message ? message : "",
@@ -2488 +2501 @@
 void oscar_chat_leave(struct groupchat *c)
 {
+        if (!c->data)
+                return;
         oscar_chat_kill(c->ic, c->data);
 }
 
-struct groupchat *oscar_chat_join(struct im_connection * ic, const char * room, const char * nick, const char * password )
+struct groupchat *oscar_chat_join_internal(struct im_connection *ic, const char *room,
+        const char *nick, const char *password, int exchange_number)
 {
         struct oscar_data * od = (struct oscar_data *)ic->proto_data;
+        struct groupchat *ret = imcb_chat_new(ic, room);
         aim_conn_t * cur;
 
@@ -2499 +2516 @@
                 int st;
                 
-                st = aim_chatnav_createroom(od->sess, cur, room, 4);
+                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);
                 
-                cr->exchange = 4;
+                cr->exchange = exchange_number;
                 cr->name = g_strdup(room);
                 od->create_rooms = g_slist_append(od->create_rooms, cr);
                 aim_reqservice(od->sess, od->conn, AIM_CONN_TYPE_CHATNAV);
                 
-                return NULL;
-        }
+                return ret;
+        }
+}
+
+struct groupchat *oscar_chat_join(struct im_connection *ic, const char *room,
+        const char *nick, const char *password, set_t **sets)
+{
+        return oscar_chat_join_internal(ic, room, nick, password, set_getint(sets, "exchange_number"));
 }
 
@@ -2519 +2542 @@
         struct groupchat *ret;
         static int chat_id = 0;
-        char * chatname;
+        char * chatname, *s;
+        struct groupchat *c;
         
         chatname = g_strdup_printf("%s%s%d", isdigit(*ic->acc->user) ? "icq" : "",
                                    ic->acc->user, chat_id++);
-  
-        ret = oscar_chat_join(ic, chatname, NULL, NULL);
-
+        
+        for (s = chatname; *s; s ++)
+                if (!isalnum(*s))
+                        *s = '0';
+        
+        c = imcb_chat_new(ic, chatname);
+        ret = oscar_chat_join_internal(ic, chatname, NULL, NULL, 4);
         aim_chat_invite(od->sess, od->conn, who, "", 4, chatname, 0x0);
 
@@ -2537 +2565 @@
         struct aim_chat_invitation * inv = data;
         
-        oscar_chat_join(inv->ic, inv->name, NULL, NULL);
+        oscar_chat_join_internal(inv->ic, inv->name, NULL, NULL, 4);
         g_free(inv->name);
         g_free(inv);
@@ -2548 +2576 @@
         g_free(inv->name);
         g_free(inv);
+}
+
+void oscar_chat_add_settings(account_t *acc, set_t **head)
+{
+        set_add(head, "exchange_number", "4", set_eval_int, NULL);
+}
+
+void oscar_chat_free_settings(account_t *acc, set_t **head)
+{
+        set_del(head, "exchange_number");
 }
 
@@ -2570 +2608 @@
         ret->chat_with = oscar_chat_with;
         ret->chat_join = oscar_chat_join;
+        ret->chat_add_settings = oscar_chat_add_settings;
+        ret->chat_free_settings = oscar_chat_free_settings;
         ret->add_permit = oscar_add_permit;
         ret->add_deny = oscar_add_deny;