Changeset d343eaa

Timestamp:

2010-05-08T12:37:49Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9e27f18

Parents:

bfb99ee

Message:

Restored imcb_chat_name_hint().

Files:

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

irc_im.c

@@ -338 +338 @@
 }
 
+static gboolean bee_irc_chat_name_hint( bee_t *bee, struct groupchat *c, const char *name )
+{
+        irc_t *irc = bee->ui_data;
+        irc_channel_t *ic = c->ui_data;
+        char stripped[MAX_NICK_LENGTH+1], *full_name;
+        
+        /* Don't rename a channel if the user's in it already. */
+        if( ic->flags & IRC_CHANNEL_JOINED )
+                return FALSE;
+        
+        strncpy( stripped, name, MAX_NICK_LENGTH );
+        stripped[MAX_NICK_LENGTH] = '\0';
+        nick_strip( stripped );
+        if( set_getbool( &bee->set, "lcnicks" ) )
+                nick_lc( stripped );
+        
+        full_name = g_strdup_printf( "&%s", stripped );
+        
+        if( stripped[0] && irc_channel_by_name( irc, full_name ) == NULL )
+        {
+                g_free( ic->name );
+                ic->name = full_name;
+        }
+        else
+        {
+                g_free( full_name );
+        }
+        
+        return TRUE;
+}
+
 /* IRC->IM */
 static gboolean bee_irc_channel_chat_privmsg( irc_channel_t *ic, const char *msg )
@@ -362 +393 @@
 static const struct irc_channel_funcs irc_channel_im_chat_funcs = {
         bee_irc_channel_chat_privmsg,
-        NULL,
+        NULL, /* join */
         bee_irc_channel_chat_part,
+        NULL, /* topic */
 };
 
@@ -407 +439 @@
         bee_irc_chat_add_user,
         bee_irc_chat_remove_user,
+        bee_irc_chat_name_hint,
         
         bee_irc_ft_in_start,

protocols/bee.h

@@ -85 +85 @@
         gboolean (*chat_add_user)( bee_t *bee, struct groupchat *c, bee_user_t *bu );
         gboolean (*chat_remove_user)( bee_t *bee, struct groupchat *c, bee_user_t *bu );
+        gboolean (*chat_name_hint)( bee_t *bee, struct groupchat *c, const char *name );
         
         struct file_transfer* (*ft_in_start)( bee_t *bee, bee_user_t *bu, const char *file_name, size_t file_size );

protocols/bee_chat.c

@@ -52 +52 @@
 void imcb_chat_name_hint( struct groupchat *c, const char *name )
 {
-#if 0
-        if( !c->joined )
-        {
-                struct im_connection *ic = c->ic;
-                char stripped[MAX_NICK_LENGTH+1], *full_name;
-                
-                strncpy( stripped, name, MAX_NICK_LENGTH );
-                stripped[MAX_NICK_LENGTH] = '\0';
-                nick_strip( stripped );
-                if( set_getbool( &ic->irc->set, "lcnicks" ) )
-                        nick_lc( stripped );
-                
-                full_name = g_strdup_printf( "&%s", stripped );
-                
-                if( stripped[0] &&
-                    nick_cmp( stripped, ic->irc->channel + 1 ) != 0 &&
-                    irc_chat_by_channel( ic->irc, full_name ) == NULL )
-                {
-                        g_free( c->channel );
-                        c->channel = full_name;
-                }
-                else
-                {
-                        g_free( full_name );
-                }
-        }
-#endif
+        bee_t *bee = c->ic->bee;
+        
+        if( bee->ui->chat_name_hint )
+                bee->ui->chat_name_hint( bee, c, name );
 }
 
@@ -225 +202 @@
 }
 
-#if 0
-static int remove_chat_buddy_silent( struct groupchat *b, const char *handle )
-{
-        GList *i;
-        
-        /* Find the handle in the room userlist and shoot it */
-        i = b->in_room;
-        while( i )
-        {
-                if( g_strcasecmp( handle, i->data ) == 0 )
-                {
-                        g_free( i->data );
-                        b->in_room = g_list_remove( b->in_room, i->data );
-                        return( 1 );
-                }
-                
-                i = i->next;
-        }
-        
-        return 0;
-}
-#endif
-
 int bee_chat_msg( bee_t *bee, struct groupchat *c, const char *msg, int flags )
 {