Changeset 81ee561 for protocols/yahoo

Timestamp:

2010-03-20T18:03:18Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

85693e6

Parents:

3330468 (diff), 0baed0d (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:

Merging head. Most changes are not so relevant because they're to IM
modules.

Location:

protocols/yahoo

Files:

• libyahoo2.c (modified) (1 diff)
• yahoo.c (modified) (1 diff)

protocols/yahoo/libyahoo2.c

@@ -1344 +1344 @@
                 case 301:       /* End buddy */
                         if (!strcmp(pair->value, "315") && u) {
-                                users = y_list_prepend(users, u);
+                                /* Sometimes user info comes in an odd format with no
+                                   "begin buddy" but *with* an "end buddy". Don't add
+                                   it twice. */
+                                if (!y_list_find(users, u))
+                                        users = y_list_prepend(users, u);
                                 u = yd->half_user = NULL;
                         }

protocols/yahoo/yahoo.c

@@ -227 +227 @@
                         yd->current_status = YAHOO_STATUS_CUSTOM;
         }
-        else if( state )
+        else if( msg )
                 yd->current_status = YAHOO_STATUS_CUSTOM;
         else