Changeset af9f2ca

Timestamp:

2010-07-11T10:59:56Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

133cdff

Parents:

1e52e1f

Message:

Added allow_takeover setting for people who don't like this new functionality.

Files:

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

doc/user-guide/commands.xml

@@ -421 +421 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="allow_takeover" type="boolean" scope="global">
+                <default>true</default>
+
+                <description>
+                        <para>
+                                When you're already connected to a BitlBee server and you connect (and identify) again, BitlBee will offer to migrate your existing session to the new connection. If for whatever reason you don't want this, you can disable this setting.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="auto_connect" type="boolean" scope="both">
                 <default>true</default>

ipc.c

@@ -317 +317 @@
         {
                 /* Master->New connection */
+                if( !set_getbool( &irc->b->set, "allow_takeover" ) )
+                {
+                        ipc_child_cmd_takeover_no( irc );
+                        return;
+                }
+                
                 /* Offer to take over the old session, unless for some reason
                    we're already logging into IM connections. */
@@ -336 +342 @@
                     ipc_child_recv_fd != -1 &&
                     strcmp( irc->user->nick, cmd[2] ) == 0 &&
-                    strcmp( irc->password, cmd[3] ) == 0 )
+                    strcmp( irc->password, cmd[3] ) == 0 &&
+                    set_getbool( &irc->b->set, "allow_takeover" ) )
                 {
                         irc_switch_fd( irc, ipc_child_recv_fd );
@@ -464 +471 @@
                                 break;
                 }
-                if( l == NULL )
+                if( l == NULL ||
+                    !set_getbool( &irc->b->set, "allow_takeover" ) ||
+                    !set_getbool( &old->b->set, "allow_takeover" ) )
                         return FALSE;
                 

irc.c

@@ -100 +100 @@
         b->ui = &irc_ui_funcs;
         
+        s = set_add( &b->set, "allow_takeover", "true", set_eval_bool, irc );
         s = set_add( &b->set, "away_devoice", "true", set_eval_away_devoice, irc );
         s = set_add( &b->set, "away_reply_timeout", "3600", set_eval_int, irc );
@@ -659 +660 @@
         {
                 b_event_remove( irc->w_watch_source_id );
+                irc->w_watch_source_id = 0;
                 g_free( irc->sendbuffer );
-                irc->sendbuffer = irc->w_watch_source_id = 0;
+                irc->sendbuffer = NULL;
         }
         

root_commands.c

@@ -175 +175 @@
                 if( !ipc_child_identify( irc ) && load &&
                     set_getbool( &irc->b->set, "auto_connect" ) )
-                {
-                        b_event_remove( irc->login_source_id );
-                        irc->login_source_id = -1;
                         cmd_identify_finish( irc, 0, 0 );
-                }
                 
                 break;
@@ -196 +192 @@
         cmd_account( irc, account_on );
         
+        b_event_remove( irc->login_source_id );
         irc->login_source_id = -1;
         return FALSE;