Changeset 0e7ab64 for protocols

Timestamp:

2007-04-23T02:58:44Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2d317bb

Parents:

43671b9

Message:

Got rid of one HORRIBLE stupidity called chat_by_channel(), which still
used the GLOBAL IM connections list, allowing user A to interfere with
user B's groupchats if running in daemon mode. I can't believe this was
still there...

Location:

protocols

Files:

• jabber/conference.c (modified) (2 diffs)
• nogaim.c (modified) (1 diff)
• nogaim.h (modified) (1 diff)

protocols/jabber/conference.c

@@ -102 +102 @@
 
 /* Not really the same syntax as the normal pkt_ functions, but this isn't
-   called by the xmltree parser exactly and this way I can add some extra
+   called by the xmltree parser directly and this way I can add some extra
    parameters so we won't have to repeat too many things done by the caller
    already. */
@@ -151 +151 @@
                 if( s ) *s = '/';
         }
-        else if( type ) /* This only gets called if type=="unavailable" */
+        else if( type ) /* This only gets called if type is NULL or "unavailable" */
         {
                 /* Won't handle this for now. */

protocols/nogaim.c

@@ -856 +856 @@
 /* Misc. BitlBee stuff which shouldn't really be here */
 
-struct groupchat *chat_by_channel( char *channel )
-{
-        struct im_connection *ic;
-        struct groupchat *c;
-        GSList *l;
-        
-        /* This finds the connection which has a conversation which belongs to this channel */
-        for( l = connections; l; l = l->next )
-        {
-                ic = l->data;
-                for( c = ic->groupchats; c && g_strcasecmp( c->channel, channel ) != 0; c = c->next );
-                if( c )
-                        return c;
-        }
-        
-        return NULL;
-}
-
 char *set_eval_away_devoice( set_t *set, char *value )
 {

protocols/nogaim.h

@@ -207 +207 @@
 G_MODULE_EXPORT void imcb_chat_msg( struct groupchat *c, char *who, char *msg, u_int32_t flags, time_t sent_at );
 G_MODULE_EXPORT void imcb_chat_free( struct groupchat *c );
-struct groupchat *chat_by_channel( char *channel );
 
 /* Actions, or whatever. */