Changeset f0cb961 for protocols/oscar

Timestamp:

2007-04-19T06:03:43Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d323394c

Parents:

33dc261

Message:

More API changes: buddy list management. imcb_add_buddy() is now a *real*
callback, it's only called from inside IM-modules. This makes sure a buddy
only gets added to the BitlBee structures if the add was successful. This
gets rid of the weirdness described in #55. Unfortunately for now this
change breaks A) automatic renaming of ICQ contacts (if there are names
stored in the contact list) B) add -tmp.

File:

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

protocols/oscar/oscar.c

@@ -1119 +1119 @@
         aim_ssi_auth_reply(od->sess, od->conn, uin, 1, "");
         // aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message);
-        if(find_buddy(data->ic, uin) == NULL)
+        if(imcb_find_buddy(data->ic, uin) == NULL)
                 imcb_ask_add(data->ic, uin, NULL);
         
@@ -1875 +1875 @@
         struct oscar_data *odata = (struct oscar_data *)g->proto_data;
         if (odata->icq) {
-                struct buddy *budlight = find_buddy(g, who);
+                struct buddy *budlight = imcb_find_buddy(g, who);
                 if (budlight)
                         if ((budlight->uc & 0xff80) >> 7)
@@ -2013 +2013 @@
                 switch (curitem->type) {
                         case 0x0000: /* Buddy */
-                                if ((curitem->name) && (!find_buddy(ic, curitem->name))) {
+                                if ((curitem->name) && (!imcb_find_buddy(ic, curitem->name))) {
                                         char *realname = NULL;
 
@@ -2019 +2019 @@
                                                     realname = aim_gettlv_str(curitem->data, 0x0131, 1);
                                                 
-                                        add_buddy(ic, NULL, curitem->name, realname);
+                                        imcb_add_buddy(ic, curitem->name, NULL);
                                         
-                                        if (realname)
-                                            g_free(realname);
+                                        if (realname) {
+                                                imcb_rename_buddy(ic, curitem->name, realname);
+                                                g_free(realname);
+                                        }
                                 }
                                 break;
@@ -2105 +2107 @@
                 {
                         st = aimbs_get16( &fr->data );
-                        if( st == 0x0E )
+                        if( st == 0x00 )
+                        {
+                                imcb_add_buddy( sess->aux_data, list, NULL );
+                        }
+                        else if( st == 0x0E )
                         {
                                 imcb_log( sess->aux_data, "Buddy %s can't be added without authorization, requesting authorization", list );
@@ -2111 +2117 @@
                                 aim_ssi_auth_request( sess, fr->conn, list, "" );
                                 aim_ssi_addbuddies( sess, fr->conn, OSCAR_GROUP, &list, 1, 1 );
+                        }
+                        else
+                        {
+                                imcb_error( sess->aux_data, "Error while adding buddy: 0x%04x", st );
                         }
                         list += strlen( list ) + 1;