Changes in protocols/yahoo/yahoo.c [eaaa986:aa7ce1b]

File:

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

protocols/yahoo/yahoo.c

@@ -153 +153 @@
         
         while( ic->groupchats )
-                imcb_chat_free( ic->groupchats->data );
+                imcb_chat_free( ic->groupchats );
         
         for( l = yd->buddygroups; l; l = l->next )
@@ -791 +791 @@
         struct byahoo_conf_invitation *inv = data;
         struct groupchat *b;
-        GSList *l;
-        
-        for( l = inv->ic->groupchats; l; l = l->next )
-        {
-                b = l->data;
+        
+        for( b = inv->ic->groupchats; b; b = b->next )
                 if( b == inv->c )
                         break;
-        }
         
         if( b != NULL )
@@ -831 +827 @@
         char txt[1024];
         YList *m;
+        
+        if( g_strcasecmp( who, ic->acc->user ) == 0 )
+                /* WTF, Yahoo! seems to echo these now? */
+                return;
         
         inv = g_malloc( sizeof( struct byahoo_conf_invitation ) );
@@ -860 +860 @@
 {
         struct im_connection *ic = byahoo_get_ic_by_id( id );
-        struct groupchat *c = bee_chat_by_title( ic->bee, ic, room );
+        struct groupchat *c;
+        
+        for( c = ic->groupchats; c && strcmp( c->title, room ) != 0; c = c->next );
         
         if( c )
@@ -870 +872 @@
 {
         struct im_connection *ic = byahoo_get_ic_by_id( id );
-        struct groupchat *c = bee_chat_by_title( ic->bee, ic, room );
+        struct groupchat *c;
+        
+        for( c = ic->groupchats; c && strcmp( c->title, room ) != 0; c = c->next );
         
         if( c )
@@ -880 +884 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         char *m = byahoo_strip( msg );
-        struct groupchat *c = bee_chat_by_title( ic->bee, ic, room );
+        struct groupchat *c;
+        
+        for( c = ic->groupchats; c && strcmp( c->title, room ) != 0; c = c->next );
         
         if( c )