Changes in protocols/yahoo/yahoo.c [56699f0:6e6b3d7]

File:

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

protocols/yahoo/yahoo.c

@@ -158 +158 @@
         
         while( ic->groupchats )
-                imcb_chat_free( ic->groupchats->data );
+                imcb_chat_free( ic->groupchats );
         
         for( l = yd->buddygroups; l; l = l->next )
@@ -613 +613 @@
         imcb_buddy_status( ic, who, flags, state_string, msg );
         
+        /* Not implemented yet...
         if( stat == YAHOO_STATUS_IDLE )
-                imcb_buddy_times( ic, who, 0, idle );
+                imcb_buddy_times( ic, who, 0, away );
+        */
 }
 
@@ -684 +686 @@
                 
                 inp->d = d;
-                d->tag = inp->h = b_input_add( fd, B_EV_IO_READ, (b_event_handler) byahoo_read_ready_callback, (gpointer) d );
+                d->tag = inp->h = b_input_add( fd, GAIM_INPUT_READ, (b_event_handler) byahoo_read_ready_callback, (gpointer) d );
         }
         else if( cond == YAHOO_INPUT_WRITE )
@@ -695 +697 @@
                 
                 inp->d = d;
-                d->tag = inp->h = b_input_add( fd, B_EV_IO_WRITE, (b_event_handler) byahoo_write_ready_callback, (gpointer) d );
+                d->tag = inp->h = b_input_add( fd, GAIM_INPUT_WRITE, (b_event_handler) byahoo_write_ready_callback, (gpointer) d );
         }
         else
@@ -794 +796 @@
         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 )
@@ -867 +865 @@
 {
         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 )
@@ -877 +877 @@
 {
         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 )
@@ -887 +889 @@
         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 )