Changeset f5c0d8e for protocols/yahoo

Timestamp:

2010-08-31T20:06:14Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0c85c08

Parents:

8358691 (diff), 31dbb90a (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 mainline stuff.

Location:

protocols/yahoo

Files:

• Makefile (modified) (2 diffs)
• libyahoo2.c (modified) (2 diffs)

protocols/yahoo/Makefile

@@ -31 +31 @@
 
 distclean: clean
+        rm -rf .depend
 
 ### MAIN PROGRAM
@@ -43 +44 @@
         @echo '*' Linking yahoo_mod.o
         @$(LD) $(LFLAGS) $(objects) -o yahoo_mod.o
+
+-include .depend/*.d

protocols/yahoo/libyahoo2.c

@@ -2169 +2169 @@
         yd->buddies = y_list_append(yd->buddies, bud);
 
+#if 0
+        /* BitlBee: This seems to be wrong in my experience. I think:
+           status = 0: Success
+           status = 2: Already on list
+           status = 3: Doesn't exist
+           status = 42: Invalid handle (possibly banned/reserved, I get it for
+                        handles like joe or jjjjjj)
+           Haven't seen others yet. But whenever the add is successful, there
+           will be a separate "went online" packet when the auth. request is
+           accepted. Couldn't find any test account that doesn't require auth.
+           unfortunately (if there is even such a thing?) */
+           
         /* A non-zero status (i've seen 2) seems to mean the buddy is already 
          * added and is online */
@@ -2176 +2188 @@
                 YAHOO_CALLBACK(ext_yahoo_status_changed) (yd->client_id, who,
                         YAHOO_STATUS_AVAILABLE, NULL, 0, 0, 0);
+        }
+#endif
+        /* BitlBee: Need ACK of added buddy, if it was successful. */
+        if (status == 0) {
+                YList *tmp = y_list_append(NULL, bud);
+                YAHOO_CALLBACK(ext_yahoo_got_buddies) (yd->client_id, tmp);
+                y_list_free(tmp);
         }
 }