Changeset 07874be for irc_im.c

Timestamp:

2010-08-14T13:44:35Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e5854a8

Parents:

5848675 (diff), 136c2bb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline stuff.

File:

• irc_im.c (modified) (3 diffs)

irc_im.c

@@ -141 +141 @@
 void bee_irc_channel_update( irc_t *irc, irc_channel_t *ic, irc_user_t *iu )
 {
-        struct irc_control_channel *icc;
         GSList *l;
-        gboolean match = FALSE;
         
         if( ic == NULL )
@@ -168 +166 @@
         }
         
-        icc = ic->data;
-        
-        if( icc->type == IRC_CC_TYPE_DEFAULT )
-                match = TRUE;
-        else if( icc->type == IRC_CC_TYPE_GROUP )
-                match = iu->bu->group == icc->group;
-        else if( icc->type == IRC_CC_TYPE_ACCOUNT )
-                match = iu->bu->ic->acc == icc->account;
-        else if( icc->type == IRC_CC_TYPE_PROTOCOL )
-                match = iu->bu->ic->acc->prpl == icc->protocol;
-        
-        if( !match )
+        if( !irc_channel_wants_user( ic, iu ) )
         {
                 irc_channel_del_user( ic, iu, IRC_CDU_PART, NULL );
@@ -185 +172 @@
         else
         {
+                struct irc_control_channel *icc = ic->data;
                 int mode = 0;