Changeset 006a84f for irc_channel.c

Timestamp:

2010-07-04T20:40:15Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

69b896b, 6c2404e

Parents:

f537044

Message:

Kick the user instead of parting him/her when cleaning up a channel. This is
what the older version also did so that Irssi won't clean up the window.

File:

• irc_channel.c (modified) (3 diffs)

irc_channel.c

@@ -119 +119 @@
         
         if( ic->flags & IRC_CHANNEL_JOINED )
-                irc_channel_del_user( ic, irc->user, FALSE, "Cleaning up channel" );
+                irc_channel_del_user( ic, irc->user, IRC_CDU_KICK, "Cleaning up channel" );
         
         if( ic->f->_free )
@@ -223 +223 @@
 }
 
-int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu, gboolean silent, const char *msg )
+int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu, irc_channel_del_user_type_t type, const char *msg )
 {
         irc_channel_user_t *icu;
@@ -233 +233 @@
         g_free( icu );
         
-        if( ic->flags & IRC_CHANNEL_JOINED && !silent )
+        if( !( ic->flags & IRC_CHANNEL_JOINED ) || type == IRC_CDU_SILENT ) {}
+                /* Do nothing. The caller should promise it won't screw
+                   up state of the IRC client. :-) */
+        else if( type == IRC_CDU_PART )
                 irc_send_part( ic, iu, msg );
+        else if( type == IRC_CDU_KICK )
+                irc_send_kick( ic, iu, ic->irc->root, msg );
         
         if( iu == ic->irc->user )