Changeset b17ce85

Timestamp:

2010-05-08T00:45:10Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e4816ea

Parents:

27e2c66

Message:

Users leaving really show up again.

Files:

• irc_im.c (modified) (3 diffs)
• protocols/bee_chat.c (modified) (1 diff)

irc_im.c

@@ -250 +250 @@
         
         irc_channel_printf( ic, "%s", text );
+        
+        return TRUE;
 }
 
@@ -273 +275 @@
         
         irc_channel_add_user( c->ui_data, bu == bee->user ? irc->user : bu->ui_data );
+        
+        return TRUE;
 }
 
 gboolean bee_irc_chat_remove_user( bee_t *bee, struct groupchat *c, bee_user_t *bu )
 {
+        irc_t *irc = bee->ui_data;
+        
+        irc_channel_del_user( c->ui_data, bu == bee->user ? irc->user : bu->ui_data );
+        
+        return TRUE;
 }
 
@@ -319 +328 @@
         bee_irc_chat_msg,
         bee_irc_chat_add_user,
-        NULL,
+        bee_irc_chat_remove_user,
         
         bee_irc_ft_in_start,

protocols/bee_chat.c

@@ -198 +198 @@
 }
 
-/* This function is one BIG hack... :-( EREWRITE */
-void imcb_chat_remove_buddy( struct groupchat *b, const char *handle, const char *reason )
-{
-#if 0
-        user_t *u;
-        int me = 0;
-        
-        if( set_getbool( &b->ic->bee->set, "debug" ) )
-                imcb_log( b->ic, "User %s removed from conversation %p (%s)", handle, b, reason ? reason : "" );
+void imcb_chat_remove_buddy( struct groupchat *c, const char *handle, const char *reason )
+{
+        struct im_connection *ic = c->ic;
+        bee_t *bee = ic->bee;
+        bee_user_t *bu = NULL;
+        
+        if( set_getbool( &bee->set, "debug" ) )
+                imcb_log( ic, "User %s removed from conversation %p (%s)", handle, c, reason ? reason : "" );
         
         /* It might be yourself! */
-        if( g_strcasecmp( handle, b->ic->acc->user ) == 0 )
-        {
-                if( b->joined == 0 )
+        if( g_strcasecmp( handle, ic->acc->user ) == 0 )
+        {
+                if( c->joined == 0 )
                         return;
                 
-                u = user_find( b->ic->irc, b->ic->irc->nick );
-                b->joined = 0;
-                me = 1;
+                bu = bee->user;
+                c->joined = 0;
         }
         else
         {
-                u = user_findhandle( b->ic, handle );
-        }
-        
-        if( me || ( remove_chat_buddy_silent( b, handle ) && b->joined && u ) )
-                irc_part( b->ic->irc, u, b->channel );
-#endif
+                bu = bee_user_by_handle( bee, ic, handle );
+        }
+        
+        if( bee->ui->chat_remove_user )
+                bee->ui->chat_remove_user( bee, c, bu );
 }