Changeset 324c378

Timestamp:

2010-07-13T23:14:41Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3709301

Parents:

b1af3e8

Message:

Move control channel autoconfiguration to irc_cmd_join() instead so that it
only triggers on channels created by the user. (And not at identify time,
which was causing odd problems on my test setup.)

Files:

• irc_channel.c (modified) (1 diff)
• irc_commands.c (modified) (1 diff)

irc_channel.c

@@ -549 +549 @@
         icc->type = IRC_CC_TYPE_DEFAULT;
         
-        if( bee_group_by_name( ic->irc->b, ic->name + 1, FALSE ) )
-        {
-                set_setstr( &ic->set, "group", ic->name + 1 );
-                set_setstr( &ic->set, "fill_by", "group" );
-        }
-        else if( set_setstr( &ic->set, "protocol", ic->name + 1 ) )
-        {
-                set_setstr( &ic->set, "fill_by", "protocol" );
-        }
-        else if( set_setstr( &ic->set, "account", ic->name + 1 ) )
-        {
-                set_setstr( &ic->set, "fill_by", "account" );
-        }
-        else
-        {
-                bee_irc_channel_update( ic->irc, ic, NULL );
-        }
-        
         return TRUE;
 }

irc_commands.c

@@ -141 +141 @@
                 
                 if( ( ic = irc_channel_by_name( irc, s ) ) == NULL )
+                {
                         ic = irc_channel_new( irc, s );
+                        
+                        if( strcmp( set_getstr( &ic->set, "type" ), "control" ) != 0 )
+                        {
+                                /* Autoconfiguration is for control channels only ATM. */
+                        }
+                        else if( bee_group_by_name( ic->irc->b, ic->name + 1, FALSE ) )
+                        {
+                                set_setstr( &ic->set, "group", ic->name + 1 );
+                                set_setstr( &ic->set, "fill_by", "group" );
+                        }
+                        else if( set_setstr( &ic->set, "protocol", ic->name + 1 ) )
+                        {
+                                set_setstr( &ic->set, "fill_by", "protocol" );
+                        }
+                        else if( set_setstr( &ic->set, "account", ic->name + 1 ) )
+                        {
+                                set_setstr( &ic->set, "fill_by", "account" );
+                        }
+                        else
+                        {
+                                bee_irc_channel_update( ic->irc, ic, NULL );
+                        }
+                }
                 
                 if( ic == NULL )