Changeset eaaa986 for protocols

Timestamp:

2010-05-08T14:48:38Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e685657

Parents:

4a9fd5f

Message:

Misc. cleanup. Also updated the Yahoo! module to deal with struct groupchat
in a GSList so that a default config fully compiles again.

Location:

protocols

Files:

• bee.h (modified) (1 diff)
• bee_chat.c (modified) (1 diff)
• jabber/presence.c (modified) (1 diff)
• yahoo/yahoo.c (modified) (5 diffs)

protocols/bee.h

@@ -129 +129 @@
 #endif
 int bee_chat_msg( bee_t *bee, struct groupchat *c, const char *msg, int flags );
+struct groupchat *bee_chat_by_title( bee_t *bee, struct im_connection *ic, const char *title );
 
 #endif /* __BEE_H__ */

protocols/bee_chat.c

@@ -218 +218 @@
         return 1;
 }
+
+struct groupchat *bee_chat_by_title( bee_t *bee, struct im_connection *ic, const char *title )
+{
+        struct groupchat *c;
+        GSList *l;
+        
+        for( l = ic->groupchats; l; l = l->next )
+        {
+                c = l->data;
+                if( strcmp( c->title, title ) == 0 )
+                        return c;
+        }
+        
+        return NULL;
+}

protocols/jabber/presence.c

@@ -205 +205 @@
         struct jabber_data *jd = ic->proto_data;
         struct xt_node *node, *cap;
-        struct groupchat *c;
         GSList *l;
         int st;

protocols/yahoo/yahoo.c

@@ -153 +153 @@
         
         while( ic->groupchats )
-                imcb_chat_free( ic->groupchats );
+                imcb_chat_free( ic->groupchats->data );
         
         for( l = yd->buddygroups; l; l = l->next )
@@ -791 +791 @@
         struct byahoo_conf_invitation *inv = data;
         struct groupchat *b;
-        
-        for( b = inv->ic->groupchats; b; b = b->next )
+        GSList *l;
+        
+        for( l = inv->ic->groupchats; l; l = l->next )
+        {
+                b = l->data;
                 if( b == inv->c )
                         break;
+        }
         
         if( b != NULL )
@@ -856 +860 @@
 {
         struct im_connection *ic = byahoo_get_ic_by_id( id );
-        struct groupchat *c;
-        
-        for( c = ic->groupchats; c && strcmp( c->title, room ) != 0; c = c->next );
+        struct groupchat *c = bee_chat_by_title( ic->bee, ic, room );
         
         if( c )
@@ -868 +870 @@
 {
         struct im_connection *ic = byahoo_get_ic_by_id( id );
-        struct groupchat *c;
-        
-        for( c = ic->groupchats; c && strcmp( c->title, room ) != 0; c = c->next );
+        struct groupchat *c = bee_chat_by_title( ic->bee, ic, room );
         
         if( c )
@@ -880 +880 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         char *m = byahoo_strip( msg );
-        struct groupchat *c;
-        
-        for( c = ic->groupchats; c && strcmp( c->title, room ) != 0; c = c->next );
+        struct groupchat *c = bee_chat_by_title( ic->bee, ic, room );
         
         if( c )