Changeset 94d5da9c for irc_im.c

Timestamp:

2010-07-18T22:12:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6d8cc05

Parents:

4f22a68c

Message:

One of the last few things I wanted to get done in this branch: combining
show_offline and away_devoice and possibly other ideas into one setting
called show_users. Documentation will come soon. :-P

File:

• irc_im.c (modified) (3 diffs)

irc_im.c

@@ -143 +143 @@
         struct irc_control_channel *icc;
         GSList *l;
-        gboolean show = FALSE;
+        gboolean match = FALSE;
         
         if( ic == NULL )
@@ -170 +170 @@
         icc = ic->data;
         
-        if( !( iu->bu->flags & BEE_USER_ONLINE ) )
-                show = FALSE;
-        else if( icc->type == IRC_CC_TYPE_DEFAULT )
-                show = TRUE;
+        if( icc->type == IRC_CC_TYPE_DEFAULT )
+                match = TRUE;
         else if( icc->type == IRC_CC_TYPE_GROUP )
-                show = iu->bu->group == icc->group;
+                match = iu->bu->group == icc->group;
         else if( icc->type == IRC_CC_TYPE_ACCOUNT )
-                show = iu->bu->ic->acc == icc->account;
+                match = iu->bu->ic->acc == icc->account;
         else if( icc->type == IRC_CC_TYPE_PROTOCOL )
-                show = iu->bu->ic->acc->prpl == icc->protocol;
-        
-        if( !show )
+                match = iu->bu->ic->acc->prpl == icc->protocol;
+        
+        if( !match )
         {
                 irc_channel_del_user( ic, iu, IRC_CDU_PART, NULL );
@@ -187 +185 @@
         else
         {
-                irc_channel_add_user( ic, iu );
-                
-                if( set_getbool( &irc->b->set, "away_devoice" ) )
-                        irc_channel_user_set_mode( ic, iu, ( iu->bu->flags & BEE_USER_AWAY ) ?
-                                                   0 : IRC_CHANNEL_USER_VOICE );
+                int mode = 0;
+                
+                if( !( iu->bu->flags & BEE_USER_ONLINE ) )
+                        mode = icc->modes[0];
+                else if( iu->bu->flags & BEE_USER_AWAY )
+                        mode = icc->modes[1];
                 else
-                        irc_channel_user_set_mode( ic, iu, 0 );
+                        mode = icc->modes[2];
+                
+                if( !mode )
+                        irc_channel_del_user( ic, iu, IRC_CDU_PART, NULL );
+                else
+                {
+                        irc_channel_add_user( ic, iu );
+                        irc_channel_user_set_mode( ic, iu, mode );
+                }
         }
 }