Changeset 0e7ab64 for irc.c

Timestamp:

2007-04-23T02:58:44Z (17 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...

File:

• irc.c (modified) (4 diffs)

irc.c

@@ -658 +658 @@
                 }
         }
-        else if( ( c = chat_by_channel( channel ) ) )
+        else if( ( c = irc_chat_by_channel( irc, channel ) ) )
         {
                 GList *l;
@@ -811 +811 @@
         else
         {
-                struct groupchat *c = chat_by_channel( channel );
+                struct groupchat *c = irc_chat_by_channel( irc, channel );
                 
                 if( c )
@@ -949 +949 @@
         if( *nick == '#' || *nick == '&' )
         {
-                if( !( c = chat_by_channel( nick ) ) )
+                if( !( c = irc_chat_by_channel( irc, nick ) ) )
                 {
                         irc_reply( irc, 403, "%s :Channel does not exist", nick );
@@ -1215 +1215 @@
         return TRUE;
 }
+
+struct groupchat *irc_chat_by_channel( irc_t *irc, char *channel )
+{
+        struct groupchat *c;
+        account_t *a;
+        
+        /* This finds the connection which has a conversation which belongs to this channel */
+        for( a = irc->accounts; a; a = a->next )
+        {
+                for( c = a->ic->groupchats; c && g_strcasecmp( c->channel, channel ) != 0; c = c->next );
+                if( c )
+                        return c;
+        }
+        
+        return NULL;
+}