Changeset f3b6764 for root_commands.c

Timestamp:

2010-07-09T23:39:25Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

534e406

Parents:

9a9b520 (diff), b556e46 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Only available in ForkDaemon mode for now: If a user connects (and
identifies) while he's already logged in, offer to take over the old
connection.

File:

• root_commands.c (modified) (4 diffs)

root_commands.c

@@ -105 +105 @@
 {
         storage_status_t status;
-        char *account_on[] = { "account", "on", NULL };
         gboolean load = TRUE;
         char *password = cmd[1];
@@ -158 +157 @@
                 irc_umode_set( irc, "+R", 1 );
                 irc_channel_auto_joins( irc, NULL );
-                if( load && set_getbool( &irc->b->set, "auto_connect" ) )
-                        cmd_account( irc, account_on );
+                
+                if( ipc_child_identify( irc ) )
+                {
+                        if( load && set_getbool( &irc->b->set, "auto_connect" ) )
+                                irc->login_source_id = b_timeout_add( 200,
+                                        cmd_identify_finish, irc );
+                }
+                else if( load && set_getbool( &irc->b->set, "auto_connect" ) )
+                        cmd_identify_finish( irc, 0, 0 );
+                
                 break;
         case STORAGE_OTHER_ERROR:
@@ -166 +173 @@
                 break;
         }
+}
+
+gboolean cmd_identify_finish( gpointer data, gint fd, b_input_condition cond )
+{
+        char *account_on[] = { "account", "on", NULL };
+        irc_t *irc = data;
+        
+        cmd_account( irc, account_on );
+        
+        irc->login_source_id = -1;
+        return FALSE;
 }
 
@@ -672 +690 @@
         else if( iu == irc->user )
         {
-                irc_usermsg( irc, "Nick `%s' can't be changed", cmd[1] );
+                irc_usermsg( irc, "Use /nick to change your own nickname" );
         }
         else if( !nick_ok( cmd[2] ) )