Changes in irc_channel.c [0e788f5:7d4ffc2]

File:

• irc_channel.c (modified) (6 diffs)

irc_channel.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2013 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -670 +670 @@
         
         icc->account = acc;
-        if( ( icc->type & IRC_CC_TYPE_MASK ) == IRC_CC_TYPE_ACCOUNT )
+        if( icc->type == IRC_CC_TYPE_ACCOUNT )
                 bee_irc_channel_update( ic->irc, ic, NULL );
         
@@ -680 +680 @@
         struct irc_channel *ic = set->data;
         struct irc_control_channel *icc = ic->data;
-        char *s;
-        
-        icc->type &= ~( IRC_CC_TYPE_MASK | IRC_CC_TYPE_INVERT );
-        
-        s = value;
-        if( s[0] == '!' )
-        {
-                icc->type |= IRC_CC_TYPE_INVERT;
-                s ++;
-        }
-        
-        if( strcmp( s, "all" ) == 0 )
-                icc->type |= IRC_CC_TYPE_DEFAULT;
-        else if( strcmp( s, "rest" ) == 0 )
-                icc->type |= IRC_CC_TYPE_REST;
-        else if( strcmp( s, "group" ) == 0 )
-                icc->type |= IRC_CC_TYPE_GROUP;
-        else if( strcmp( s, "account" ) == 0 )
-                icc->type |= IRC_CC_TYPE_ACCOUNT;
-        else if( strcmp( s, "protocol" ) == 0 )
-                icc->type |= IRC_CC_TYPE_PROTOCOL;
+        
+        if( strcmp( value, "all" ) == 0 )
+                icc->type = IRC_CC_TYPE_DEFAULT;
+        else if( strcmp( value, "rest" ) == 0 )
+                icc->type = IRC_CC_TYPE_REST;
+        else if( strcmp( value, "group" ) == 0 )
+                icc->type = IRC_CC_TYPE_GROUP;
+        else if( strcmp( value, "account" ) == 0 )
+                icc->type = IRC_CC_TYPE_ACCOUNT;
+        else if( strcmp( value, "protocol" ) == 0 )
+                icc->type = IRC_CC_TYPE_PROTOCOL;
         else
                 return SET_INVALID;
@@ -714 +704 @@
         
         icc->group = bee_group_by_name( ic->irc->b, value, TRUE );
-        if( ( icc->type & IRC_CC_TYPE_MASK ) == IRC_CC_TYPE_GROUP )
+        if( icc->type == IRC_CC_TYPE_GROUP )
                 bee_irc_channel_update( ic->irc, ic, NULL );
         
@@ -730 +720 @@
         
         icc->protocol = prpl;
-        if( ( icc->type & IRC_CC_TYPE_MASK ) == IRC_CC_TYPE_PROTOCOL )
+        if( icc->type == IRC_CC_TYPE_PROTOCOL )
                 bee_irc_channel_update( ic->irc, ic, NULL );
         
@@ -786 +776 @@
 {
         struct irc_control_channel *icc = ic->data;
-        gboolean ret = FALSE;
         
         if( iu->bu == NULL )
                 return FALSE;
         
-        switch( icc->type & IRC_CC_TYPE_MASK )
+        switch( icc->type )
         {
         case IRC_CC_TYPE_GROUP:
-                ret = iu->bu->group == icc->group;
-                break;
+                return iu->bu->group == icc->group;
         case IRC_CC_TYPE_ACCOUNT:
-                ret = iu->bu->ic->acc == icc->account;
-                break;
+                return iu->bu->ic->acc == icc->account;
         case IRC_CC_TYPE_PROTOCOL:
-                ret = iu->bu->ic->acc->prpl == icc->protocol;
-                break;
+                return iu->bu->ic->acc->prpl == icc->protocol;
         case IRC_CC_TYPE_DEFAULT:
         default:
-                ret = TRUE;
-                break;
-        }
-        
-        if( icc->type & IRC_CC_TYPE_INVERT )
-                ret = !ret;
-        
-        return ret;
+                return TRUE;
+        }
 }