Changeset 52a2521

Timestamp:

2010-06-30T23:46:55Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3353b5e

Parents:

06f9548

Message:

When receiving a channel name hint, and a channel with that name already
exists, remove it if it's fully unused, instead of failing immediately.
(Fixes #639.)

File:

• irc_im.c (modified) (3 diffs)

irc_im.c

@@ -421 +421 @@
         
         /* Try to find a channel that expects to receive a groupchat.
-           This flag is set by groupchat_stub_invite(). */
+           This flag is set earlier in our current call trace. */
         for( l = irc->channels; l; l = l->next )
         {
@@ -530 +530 @@
 {
         irc_t *irc = bee->ui_data;
-        irc_channel_t *ic = c->ui_data;
+        irc_channel_t *ic = c->ui_data, *oic;
         char stripped[MAX_NICK_LENGTH+1], *full_name;
         
@@ -543 +543 @@
                 nick_lc( stripped );
         
+        if( stripped[0] == '\0' )
+                return FALSE;
+        
         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 );
-        }
+        if( ( oic = irc_channel_by_name( irc, full_name ) ) )
+        {
+                char *type, *chat_type;
+                
+                type = set_getstr( &oic->set, "type" );
+                chat_type = set_getstr( &oic->set, "chat_type" );
+                
+                if( type && chat_type && oic->data == FALSE &&
+                    strcmp( type, "chat" ) == 0 &&
+                    strcmp( chat_type, "groupchat" ) == 0 )
+                {
+                        /* There's a channel with this name already, but it looks
+                           like it's not in use yet. Most likely the IRC client
+                           rejoined the channel after a reconnect. Remove it so
+                           we can reuse its name. */
+                        irc_channel_free( oic );
+                }
+                else
+                {
+                        g_free( full_name );
+                        return FALSE;
+                }
+        }
+        
+        g_free( ic->name );
+        ic->name = full_name;
         
         return TRUE;