Changeset 0baed0d

Timestamp:

2010-03-19T00:09:50Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

21029d0, 545d7c0, 81ee561

Parents:

5fbec3d

Message:

Allow changing the name of the control channel at run-time.

Files:

• bitlbee.h (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (1 diff)
• irc.c (modified) (1 diff)
• root_commands.c (modified) (3 diffs)

bitlbee.h

@@ -163 +163 @@
 
 char *set_eval_root_nick( set_t *set, char *new_nick );
+char *set_eval_control_channel( set_t *set, char *new_name );
 
 extern global_t global;

doc/user-guide/commands.xml

@@ -511 +511 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="control_channel" type="string" scope="global">
+                <default>&amp;bitlbee</default>
+
+                <description>
+                        <para>
+                                Normally the control channel where you can see all your contacts is called "&amp;bitlbee". If you don't like this name, you can rename it to anything else using the <emphasis>rename</emphasis> command, or by changing this setting.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="debug" type="boolean" scope="global">
                 <default>false</default>

irc.c

@@ -171 +171 @@
         s = set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc );
         s = set_add( &irc->set, "charset", "utf-8", set_eval_charset, irc );
+        s = set_add( &irc->set, "control_channel", irc->channel, set_eval_control_channel, irc );
         s = set_add( &irc->set, "debug", "false", set_eval_bool, irc );
         s = set_add( &irc->set, "default_target", "root", NULL, irc );

root_commands.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -654 +654 @@
                 irc_usermsg( irc, "Nick `%s' can't be changed", cmd[1] );
         }
+        else if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
+        {
+                if( strchr( CTYPES, cmd[2][0] ) && nick_ok( cmd[2] + 1 ) )
+                {
+                        u = user_find( irc, irc->nick );
+                        
+                        irc_part( irc, u, irc->channel );
+                        g_free( irc->channel );
+                        irc->channel = g_strdup( cmd[2] );
+                        irc_join( irc, u, irc->channel );
+                        
+                        if( strcmp( cmd[0], "set_rename" ) != 0 )
+                                set_setstr( &irc->set, "control_channel", cmd[2] );
+                }
+        }
         else if( user_find( irc, cmd[2] ) && ( nick_cmp( cmd[1], cmd[2] ) != 0 ) )
         {
@@ -701 +716 @@
         
         return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : SET_INVALID;
+}
+
+char *set_eval_control_channel( set_t *set, char *new_name )
+{
+        irc_t *irc = set->data;
+        
+        if( strcmp( irc->channel, new_name ) != 0 )
+        {
+                char *cmd[] = { "set_rename", irc->channel, new_name, NULL };
+                
+                cmd_rename( irc, cmd );
+        }
+        
+        return strcmp( irc->channel, new_name ) == 0 ? new_name : SET_INVALID;
 }