Index: root_commands.c
===================================================================
--- root_commands.c	(revision a4d920bfc34db9ca9161ff3817385423e52b8c90)
+++ root_commands.c	(revision ba7d16f3c90de2744243efe6373ccebe51cfcb5a)
@@ -32,7 +32,48 @@
 #include <string.h>
 
-void root_command_string( irc_t *irc, char *command )
-{
-	root_command( irc, split_command_parts( command ) );
+void root_command_string( irc_t *irc, user_t *u, char *command, int flags )
+{
+	char *cmd[IRC_MAX_ARGS];
+	char *s;
+	int k;
+	char q = 0;
+	
+	memset( cmd, 0, sizeof( cmd ) );
+	cmd[0] = command;
+	k = 1;
+	for( s = command; *s && k < ( IRC_MAX_ARGS - 1 ); s ++ )
+		if( *s == ' ' && !q )
+		{
+			*s = 0;
+			while( *++s == ' ' );
+			if( *s == '"' || *s == '\'' )
+			{
+				q = *s;
+				s ++;
+			}
+			if( *s )
+			{
+				cmd[k++] = s;
+				s --;
+			}
+			else
+			{
+				break;
+			}
+		}
+		else if( *s == '\\' && ( ( !q && s[1] ) || ( q && q == s[1] ) ) )
+		{
+			char *cpy;
+			
+			for( cpy = s; *cpy; cpy ++ )
+				cpy[0] = cpy[1];
+		}
+		else if( *s == q )
+		{
+			q = *s = 0;
+		}
+	cmd[k] = NULL;
+	
+	root_command( irc, cmd );
 }
 
@@ -51,18 +92,12 @@
 void root_command( irc_t *irc, char *cmd[] )
 {	
-	int i, len;
+	int i;
 	
 	if( !cmd[0] )
 		return;
 	
-	len = strlen( cmd[0] );
 	for( i = 0; commands[i].command; i++ )
-		if( g_strncasecmp( commands[i].command, cmd[0], len ) == 0 )
-		{
-			if( commands[i+1].command &&
-		            g_strncasecmp( commands[i+1].command, cmd[0], len ) == 0 )
-		        	/* Only match on the first letters if the match is unique. */
-		        	break;
-		        
+		if( g_strcasecmp( commands[i].command, cmd[0] ) == 0 )
+		{
 			MIN_ARGS( commands[i].required_parameters );
 			
@@ -105,43 +140,12 @@
 static void cmd_identify( irc_t *irc, char **cmd )
 {
-	storage_status_t status;
+	storage_status_t status = storage_load( irc, cmd[1] );
 	char *account_on[] = { "account", "on", NULL };
-	gboolean load = TRUE;
-	char *password = cmd[1];
-	
-	if( irc->status & USTATUS_IDENTIFIED )
+	
+	if( strchr( irc->umode, 'R' ) != NULL )
 	{
 		irc_usermsg( irc, "You're already logged in." );
 		return;
 	}
-	
-	if( strncmp( cmd[1], "-no", 3 ) == 0 )
-	{
-		load = FALSE;
-		password = cmd[2];
-	}
-	else if( strncmp( cmd[1], "-force", 6 ) == 0 )
-	{
-		password = cmd[2];
-	}
-	else if( irc->b->accounts != NULL )
-	{
-		irc_usermsg( irc,
-		             "You're trying to identify yourself, but already have "
-		             "at least one IM account set up. "
-		             "Use \x02identify -noload\x02 or \x02identify -force\x02 "
-		             "instead (see \x02help identify\x02)." );
-		return;
-	}
-	
-	if( password == NULL )
-	{
-		MIN_ARGS( 2 );
-	}
-	
-	if( load )
-		status = storage_load( irc, password );
-	else
-		status = storage_check_pass( irc->user->nick, password );
 	
 	switch (status) {
@@ -153,10 +157,9 @@
 		break;
 	case STORAGE_OK:
-		irc_usermsg( irc, "Password accepted%s",
-		             load ? ", settings and accounts loaded" : "" );
-		irc_setpass( irc, password );
+		irc_usermsg( irc, "Password accepted, settings and accounts loaded" );
+		irc_setpass( irc, cmd[1] );
 		irc->status |= USTATUS_IDENTIFIED;
 		irc_umode_set( irc, "+R", 1 );
-		if( load && set_getbool( &irc->b->set, "auto_connect" ) )
+		if( set_getbool( &irc->set, "auto_connect" ) )
 			cmd_account( irc, account_on );
 		break;
@@ -198,5 +201,5 @@
 	storage_status_t status;
 	
-	status = storage_remove (irc->user->nick, cmd[1]);
+	status = storage_remove (irc->nick, cmd[1]);
 	switch (status) {
 	case STORAGE_NO_SUCH_USER:
@@ -210,5 +213,5 @@
 		irc->status &= ~USTATUS_IDENTIFIED;
 		irc_umode_set( irc, "-R", 1 );
-		irc_usermsg( irc, "Account `%s' removed", irc->user->nick );
+		irc_usermsg( irc, "Account `%s' removed", irc->nick );
 		break;
 	default:
@@ -218,12 +221,36 @@
 }
 
-static void cmd_save( irc_t *irc, char **cmd )
-{
-	if( ( irc->status & USTATUS_IDENTIFIED ) == 0 )
-		irc_usermsg( irc, "Please create an account first" );
-	else if( storage_save( irc, NULL, TRUE ) == STORAGE_OK )
-		irc_usermsg( irc, "Configuration saved" );
-	else
-		irc_usermsg( irc, "Configuration could not be saved!" );
+struct cmd_account_del_data
+{
+	account_t *a;
+	irc_t *irc;
+};
+
+void cmd_account_del_yes( void *data )
+{
+	struct cmd_account_del_data *cad = data;
+	account_t *a;
+	
+	for( a = cad->irc->accounts; a && a != cad->a; a = a->next );
+	
+	if( a == NULL )
+	{
+		irc_usermsg( cad->irc, "Account already deleted" );
+	}
+	else if( a->ic )
+	{
+		irc_usermsg( cad->irc, "Account is still logged in, can't delete" );
+	}
+	else
+	{
+		account_del( cad->irc, a );
+		irc_usermsg( cad->irc, "Account deleted" );
+	}
+	g_free( data );
+}
+
+void cmd_account_del_no( void *data )
+{
+	g_free( data );
 }
 
@@ -258,5 +285,5 @@
 		set_name = set_full;
 		
-		head = &irc->b->set;
+		head = &irc->set;
 	}
 	else 
@@ -329,5 +356,5 @@
 	account_t *a;
 	
-	if( ( a = account_get( irc->b, id ) ) )
+	if( ( a = account_get( irc, id ) ) )
 		return &a->set;
 	else
@@ -377,5 +404,5 @@
 		}
 
-		a = account_add( irc->b, prpl, cmd[3], cmd[4] );
+		a = account_add( irc, prpl, cmd[3], cmd[4] );
 		if( cmd[5] )
 		{
@@ -391,5 +418,5 @@
 		MIN_ARGS( 2 );
 
-		if( !( a = account_get( irc->b, cmd[2] ) ) )
+		if( !( a = account_get( irc, cmd[2] ) ) )
 		{
 			irc_usermsg( irc, "Invalid account" );
@@ -401,6 +428,18 @@
 		else
 		{
-			account_del( irc->b, a );
-			irc_usermsg( irc, "Account deleted" );
+			struct cmd_account_del_data *cad;
+			char *msg;
+			
+			cad = g_malloc( sizeof( struct cmd_account_del_data ) );
+			cad->a = a;
+			cad->irc = irc;
+			
+			msg = g_strdup_printf( "If you remove this account (%s(%s)), BitlBee will "
+			                       "also forget all your saved nicknames. If you want "
+			                       "to change your username/password, use the `account "
+			                       "set' command. Are you sure you want to delete this "
+			                       "account?", a->prpl->name, a->user );
+			query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, cad );
+			g_free( msg );
 		}
 	}
@@ -412,5 +451,5 @@
 			irc_usermsg( irc, "Account list:" );
 		
-		for( a = irc->b->accounts; a; a = a->next )
+		for( a = irc->accounts; a; a = a->next )
 		{
 			char *con;
@@ -435,5 +474,5 @@
 		if( cmd[2] )
 		{
-			if( ( a = account_get( irc->b, cmd[2] ) ) )
+			if( ( a = account_get( irc, cmd[2] ) ) )
 			{
 				if( a->ic )
@@ -444,5 +483,5 @@
 				else
 				{
-					account_on( irc->b, a );
+					account_on( irc, a );
 				}
 			}
@@ -455,11 +494,10 @@
 		else
 		{
-			if ( irc->b->accounts )
-			{
+			if ( irc->accounts ) {
 				irc_usermsg( irc, "Trying to get all accounts connected..." );
 			
-				for( a = irc->b->accounts; a; a = a->next )
+				for( a = irc->accounts; a; a = a->next )
 					if( !a->ic && a->auto_connect )
-						account_on( irc->b, a );
+						account_on( irc, a );
 			} 
 			else
@@ -475,17 +513,17 @@
 			irc_usermsg( irc, "Deactivating all active (re)connections..." );
 			
-			for( a = irc->b->accounts; a; a = a->next )
+			for( a = irc->accounts; a; a = a->next )
 			{
 				if( a->ic )
-					account_off( irc->b, a );
+					account_off( irc, a );
 				else if( a->reconnect )
 					cancel_auto_reconnect( a );
 			}
 		}
-		else if( ( a = account_get( irc->b, cmd[2] ) ) )
+		else if( ( a = account_get( irc, cmd[2] ) ) )
 		{
 			if( a->ic )
 			{
-				account_off( irc->b, a );
+				account_off( irc, a );
 			}
 			else if( a->reconnect )
@@ -515,66 +553,4 @@
 	{
 		irc_usermsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "account", cmd[1] );
-	}
-}
-
-static set_t **cmd_channel_set_findhead( irc_t *irc, char *id )
-{
-	irc_channel_t *ic;
-	
-	if( ( ic = irc_channel_get( irc, id ) ) )
-		return &ic->set;
-	else
-		return NULL;
-}
-
-static void cmd_channel( irc_t *irc, char **cmd )
-{
-	if( g_strcasecmp( cmd[1], "set" ) == 0 )
-	{
-		MIN_ARGS( 2 );
-		
-		cmd_set_real( irc, cmd + 1, cmd_channel_set_findhead, NULL );
-	}
-	else if( g_strcasecmp( cmd[1], "list" ) == 0 )
-	{
-		GSList *l;
-		int i = 0;
-		
-		if( strchr( irc->umode, 'b' ) )
-			irc_usermsg( irc, "Channel list:" );
-		
-		for( l = irc->channels; l; l = l->next )
-		{
-			irc_channel_t *ic = l->data;
-			
-			irc_usermsg( irc, "%2d. %s, %s channel%s", i, ic->name,
-			             set_getstr( &ic->set, "type" ),
-			             ic->flags & IRC_CHANNEL_JOINED ? " (joined)" : "" );
-			
-			i ++;
-		}
-		irc_usermsg( irc, "End of channel list" );
-	}
-	else if( g_strcasecmp( cmd[1], "del" ) == 0 )
-	{
-		irc_channel_t *ic;
-		
-		MIN_ARGS( 2 );
-		
-		if( ( ic = irc_channel_get( irc, cmd[2] ) ) &&
-		   !( ic->flags & IRC_CHANNEL_JOINED ) &&
-		    ic != ic->irc->default_channel )
-		{
-			irc_usermsg( irc, "Channel %s deleted.", ic->name );
-			irc_channel_free( ic );
-		}
-		else
-			irc_usermsg( irc, "Couldn't remove channel (main channel %s or "
-			                  "channels you're still in cannot be deleted).",
-			                  ic->irc->default_channel->name );
-	}
-	else
-	{
-		irc_usermsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "channel", cmd[1] );
 	}
 }
@@ -592,5 +568,5 @@
 	}
 	
-	if( !( a = account_get( irc->b, cmd[1] ) ) )
+	if( !( a = account_get( irc, cmd[1] ) ) )
 	{
 		irc_usermsg( irc, "Invalid account" );
@@ -610,5 +586,5 @@
 			return;
 		}
-		else if( irc_user_by_name( irc, cmd[3] ) )
+		else if( user_find( irc, cmd[3] ) )
 		{
 			irc_usermsg( irc, "The requested nick `%s' already exists", cmd[3] );
@@ -624,32 +600,10 @@
 		a->ic->acc->prpl->add_buddy( a->ic, cmd[2], NULL );
 	else
-		/* Only for add -tmp. For regular adds, this callback will
-		   be called once the IM server confirms. */
-		bee_user_new( irc->b, a->ic, cmd[2], BEE_USER_LOCAL );
+		/* Yeah, officially this is a call-*back*... So if we just
+		   called add_buddy, we'll wait for the IM server to respond
+		   before we do this. */
+		imcb_add_buddy( a->ic, cmd[2], NULL );
 	
 	irc_usermsg( irc, "Adding `%s' to your contact list", cmd[2]  );
-}
-
-static void cmd_remove( irc_t *irc, char **cmd )
-{
-	irc_user_t *iu;
-	bee_user_t *bu;
-	char *s;
-	
-	if( !( iu = irc_user_by_name( irc, cmd[1] ) ) || !( bu = iu->bu ) )
-	{
-		irc_usermsg( irc, "Buddy `%s' not found", cmd[1] );
-		return;
-	}
-	s = g_strdup( bu->handle );
-	
-	bu->ic->acc->prpl->remove_buddy( bu->ic, bu->handle, NULL );
-	nick_del( bu->ic->acc, bu->handle );
-	//TODO(wilmer): bee_user_free() and/or let the IM mod do it? irc_user_free( irc, cmd[1] );
-	
-	irc_usermsg( irc, "Buddy `%s' (nick %s) removed from contact list", s, cmd[1] );
-	g_free( s );
-	
-	return;
 }
 
@@ -661,14 +615,14 @@
 	if( !cmd[2] )
 	{
-		irc_user_t *iu = irc_user_by_name( irc, cmd[1] );
-		if( !iu || !iu->bu )
+		user_t *u = user_find( irc, cmd[1] );
+		if( !u || !u->ic )
 		{
 			irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
 			return;
 		}
-		ic = iu->bu->ic;
-		cmd[2] = iu->bu->handle;
-	}
-	else if( !( a = account_get( irc->b, cmd[1] ) ) )
+		ic = u->ic;
+		cmd[2] = u->handle;
+	}
+	else if( !( a = account_get( irc, cmd[1] ) ) )
 	{
 		irc_usermsg( irc, "Invalid account" );
@@ -693,42 +647,54 @@
 static void cmd_rename( irc_t *irc, char **cmd )
 {
-	irc_user_t *iu;
-	
-	iu = irc_user_by_name( irc, cmd[1] );
-	
-	if( iu == NULL )
+	user_t *u;
+	
+	if( g_strcasecmp( cmd[1], irc->nick ) == 0 )
+	{
+		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 ) )
+	{
+		irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );
+	}
+	else if( !nick_ok( cmd[2] ) )
+	{
+		irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] );
+	}
+	else if( !( u = user_find( irc, cmd[1] ) ) )
 	{
 		irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
 	}
-	else if( iu == irc->user )
-	{
-		irc_usermsg( irc, "Nick `%s' can't be changed", cmd[1] );
-	}
-	else if( !nick_ok( cmd[2] ) )
-	{
-		irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] );
-	}
-	else if( irc_user_by_name( irc, cmd[2] ) )
-	{
-		irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );
-	}
-	else
-	{
-		if( !irc_user_set_nick( iu, cmd[2] ) )
-		{
-			irc_usermsg( irc, "Error while changing nick" );
-			return;
-		}
-		
-		if( iu == irc->root )
-		{
+	else
+	{
+		user_rename( irc, cmd[1], cmd[2] );
+		irc_write( irc, ":%s!%s@%s NICK %s", cmd[1], u->user, u->host, cmd[2] );
+		if( g_strcasecmp( cmd[1], irc->mynick ) == 0 )
+		{
+			g_free( irc->mynick );
+			irc->mynick = g_strdup( cmd[2] );
+			
 			/* If we're called internally (user did "set root_nick"),
 			   let's not go O(INF). :-) */
 			if( strcmp( cmd[0], "set_rename" ) != 0 )
-				set_setstr( &irc->b->set, "root_nick", cmd[2] );
-		}
-		else if( iu->bu )
-		{
-			nick_set( iu->bu->ic->acc, iu->bu->handle, cmd[2] );
+				set_setstr( &irc->set, "root_nick", cmd[2] );
+		}
+		else if( u->send_handler == buddy_send_handler )
+		{
+			nick_set( u->ic->acc, u->handle, cmd[2] );
 		}
 		
@@ -741,12 +707,48 @@
 	irc_t *irc = set->data;
 	
-	if( strcmp( irc->root->nick, new_nick ) != 0 )
-	{
-		char *cmd[] = { "set_rename", irc->root->nick, new_nick, NULL };
+	if( strcmp( irc->mynick, new_nick ) != 0 )
+	{
+		char *cmd[] = { "set_rename", irc->mynick, new_nick, NULL };
 		
 		cmd_rename( irc, cmd );
 	}
 	
-	return strcmp( irc->root->nick, new_nick ) == 0 ? new_nick : SET_INVALID;
+	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;
+}
+
+static void cmd_remove( irc_t *irc, char **cmd )
+{
+	user_t *u;
+	char *s;
+	
+	if( !( u = user_find( irc, cmd[1] ) ) || !u->ic )
+	{
+		irc_usermsg( irc, "Buddy `%s' not found", cmd[1] );
+		return;
+	}
+	s = g_strdup( u->handle );
+	
+	u->ic->acc->prpl->remove_buddy( u->ic, u->handle, NULL );
+	nick_del( u->ic->acc, u->handle );
+	user_del( irc, cmd[1] );
+	
+	irc_usermsg( irc, "Buddy `%s' (nick %s) removed from contact list", s, cmd[1] );
+	g_free( s );
+	
+	return;
 }
 
@@ -756,5 +758,5 @@
 	account_t *a;
 	
-	if( !cmd[2] && ( a = account_get( irc->b, cmd[1] ) ) && a->ic )
+	if( !cmd[2] && ( a = account_get( irc, cmd[1] ) ) && a->ic )
 	{
 		char *format;
@@ -769,7 +771,6 @@
 		for( l = a->ic->deny; l; l = l->next )
 		{
-			bee_user_t *bu = bee_user_by_handle( irc->b, a->ic, l->data );
-			irc_user_t *iu = bu ? bu->ui_data : NULL;
-			irc_usermsg( irc, format, l->data, iu ? iu->nick : "(none)" );
+			user_t *u = user_findhandle( a->ic, l->data );
+			irc_usermsg( irc, format, l->data, u ? u->nick : "(none)" );
 		}
 		irc_usermsg( irc, "End of list." );
@@ -779,14 +780,14 @@
 	else if( !cmd[2] )
 	{
-		irc_user_t *iu = irc_user_by_name( irc, cmd[1] );
-		if( !iu || !iu->bu )
+		user_t *u = user_find( irc, cmd[1] );
+		if( !u || !u->ic )
 		{
 			irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
 			return;
 		}
-		ic = iu->bu->ic;
-		cmd[2] = iu->bu->handle;
-	}
-	else if( !( a = account_get( irc->b, cmd[1] ) ) )
+		ic = u->ic;
+		cmd[2] = u->handle;
+	}
+	else if( !( a = account_get( irc, cmd[1] ) ) )
 	{
 		irc_usermsg( irc, "Invalid account" );
@@ -816,5 +817,5 @@
 	account_t *a;
 	
-	if( !cmd[2] && ( a = account_get( irc->b, cmd[1] ) ) && a->ic )
+	if( !cmd[2] && ( a = account_get( irc, cmd[1] ) ) && a->ic )
 	{
 		char *format;
@@ -829,7 +830,6 @@
 		for( l = a->ic->permit; l; l = l->next )
 		{
-			bee_user_t *bu = bee_user_by_handle( irc->b, a->ic, l->data );
-			irc_user_t *iu = bu ? bu->ui_data : NULL;
-			irc_usermsg( irc, format, l->data, iu ? iu->nick : "(none)" );
+			user_t *u = user_findhandle( a->ic, l->data );
+			irc_usermsg( irc, format, l->data, u ? u->nick : "(none)" );
 		}
 		irc_usermsg( irc, "End of list." );
@@ -839,14 +839,14 @@
 	else if( !cmd[2] )
 	{
-		irc_user_t *iu = irc_user_by_name( irc, cmd[1] );
-		if( !iu || !iu->bu )
+		user_t *u = user_find( irc, cmd[1] );
+		if( !u || !u->ic )
 		{
 			irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
 			return;
 		}
-		ic = iu->bu->ic;
-		cmd[2] = iu->bu->handle;
-	}
-	else if( !( a = account_get( irc->b, cmd[1] ) ) )
+		ic = u->ic;
+		cmd[2] = u->handle;
+	}
+	else if( !( a = account_get( irc, cmd[1] ) ) )
 	{
 		irc_usermsg( irc, "Invalid account" );
@@ -915,8 +915,18 @@
 }
 
+static void cmd_save( irc_t *irc, char **cmd )
+{
+	if( ( irc->status & USTATUS_IDENTIFIED ) == 0 )
+		irc_usermsg( irc, "Please create an account first" );
+	else if( storage_save( irc, NULL, TRUE ) == STORAGE_OK )
+		irc_usermsg( irc, "Configuration saved" );
+	else
+		irc_usermsg( irc, "Configuration could not be saved!" );
+}
+
 static void cmd_blist( irc_t *irc, char **cmd )
 {
 	int online = 0, away = 0, offline = 0;
-	GSList *l;
+	user_t *u;
 	char s[256];
 	char *format;
@@ -939,23 +949,17 @@
 		format = "%-16.16s  %-40.40s  %s";
 	
-	irc_usermsg( irc, format, "Nick", "Handle/Account", "Status" );
-	
-	for( l = irc->users; l; l = l->next )
-	{
-		irc_user_t *iu = l->data;
-		bee_user_t *bu = iu->bu;
-		
-		if( !bu || ( bu->flags & ( BEE_USER_ONLINE | BEE_USER_AWAY ) ) != BEE_USER_ONLINE )
-			continue;
-		
+	irc_usermsg( irc, format, "Nick", "User/Host/Network", "Status" );
+	
+	for( u = irc->users; u; u = u->next ) if( u->ic && u->online && !u->away )
+	{
 		if( online == 1 )
 		{
 			char st[256] = "Online";
 			
-			if( bu->status_msg )
-				g_snprintf( st, sizeof( st ) - 1, "Online (%s)", bu->status_msg );
-			
-			g_snprintf( s, sizeof( s ) - 1, "%s %s(%s)", bu->handle, bu->ic->acc->prpl->name, bu->ic->acc->user );
-			irc_usermsg( irc, format, iu->nick, s, st );
+			if( u->status_msg )
+				g_snprintf( st, sizeof( st ) - 1, "Online (%s)", u->status_msg );
+			
+			g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
+			irc_usermsg( irc, format, u->nick, s, st );
 		}
 		
@@ -963,32 +967,20 @@
 	}
 
-	for( l = irc->users; l; l = l->next )
-	{
-		irc_user_t *iu = l->data;
-		bee_user_t *bu = iu->bu;
-		
-		if( !bu || !( bu->flags & BEE_USER_ONLINE ) || !( bu->flags & BEE_USER_AWAY ) )
-			continue;
-		
+	for( u = irc->users; u; u = u->next ) if( u->ic && u->online && u->away )
+	{
 		if( away == 1 )
 		{
-			g_snprintf( s, sizeof( s ) - 1, "%s %s(%s)", bu->handle, bu->ic->acc->prpl->name, bu->ic->acc->user );
-			irc_usermsg( irc, format, iu->nick, s, irc_user_get_away( iu ) );
+			g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
+			irc_usermsg( irc, format, u->nick, s, u->away );
 		}
 		n_away ++;
 	}
 	
-	for( l = irc->users; l; l = l->next )
-	{
-		irc_user_t *iu = l->data;
-		bee_user_t *bu = iu->bu;
-		
-		if( !bu || bu->flags & BEE_USER_ONLINE )
-			continue;
-		
+	for( u = irc->users; u; u = u->next ) if( u->ic && !u->online )
+	{
 		if( offline == 1 )
 		{
-			g_snprintf( s, sizeof( s ) - 1, "%s %s(%s)", bu->handle, bu->ic->acc->prpl->name, bu->ic->acc->user );
-			irc_usermsg( irc, format, iu->nick, s, "Offline" );
+			g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
+			irc_usermsg( irc, format, u->nick, s, "Offline" );
 		}
 		n_offline ++;
@@ -996,4 +988,32 @@
 	
 	irc_usermsg( irc, "%d buddies (%d available, %d away, %d offline)", n_online + n_away + n_offline, n_online, n_away, n_offline );
+}
+
+static void cmd_nick( irc_t *irc, char **cmd ) 
+{
+	account_t *a;
+
+	if( !cmd[1] || !( a = account_get( irc, cmd[1] ) ) )
+	{
+		irc_usermsg( irc, "Invalid account");
+	}
+	else if( !( a->ic && ( a->ic->flags & OPT_LOGGED_IN ) ) )
+	{
+		irc_usermsg( irc, "That account is not on-line" );
+	}
+	else if ( !cmd[2] ) 
+	{
+		irc_usermsg( irc, "Your name is `%s'" , a->ic->displayname ? a->ic->displayname : "NULL" );
+	}
+	else if ( !a->prpl->set_my_name ) 
+	{
+		irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
+	}
+	else
+	{
+		irc_usermsg( irc, "Setting your name to `%s'", cmd[2] );
+		
+		a->prpl->set_my_name( a->ic, cmd[2] );
+	}
 }
 
@@ -1018,23 +1038,34 @@
 }
 
+static void cmd_join_chat( irc_t *irc, char **cmd )
+{
+	irc_usermsg( irc, "This command is now obsolete. "
+	                  "Please try the `chat' command instead." );
+}
+
+static set_t **cmd_chat_set_findhead( irc_t *irc, char *id )
+{
+	struct chat *c;
+	
+	if( ( c = chat_get( irc, id ) ) )
+		return &c->set;
+	else
+		return NULL;
+}
+
 static void cmd_chat( irc_t *irc, char **cmd )
 {
 	account_t *acc;
+	struct chat *c;
 	
 	if( g_strcasecmp( cmd[1], "add" ) == 0 )
 	{
 		char *channel, *s;
-		struct irc_channel *ic;
 		
 		MIN_ARGS( 3 );
 		
-		if( !( acc = account_get( irc->b, cmd[2] ) ) )
+		if( !( acc = account_get( irc, cmd[2] ) ) )
 		{
 			irc_usermsg( irc, "Invalid account" );
-			return;
-		}
-		else if( !acc->prpl->chat_join )
-		{
-			irc_usermsg( irc, "Named chatrooms not supported on that account." );
 			return;
 		}
@@ -1053,37 +1084,63 @@
 		if( strchr( CTYPES, channel[0] ) == NULL )
 		{
-			s = g_strdup_printf( "#%s", channel );
+			s = g_strdup_printf( "%c%s", CTYPES[0], channel );
 			g_free( channel );
 			channel = s;
 		}
 		
-		if( ( ic = irc_channel_new( irc, channel ) ) &&
-		    set_setstr( &ic->set, "chat_type", "room" ) &&
-		    set_setstr( &ic->set, "account", cmd[2] ) &&
-		    set_setstr( &ic->set, "room", cmd[3] ) )
-		{
-			irc_usermsg( irc, "Chatroom successfully added." );
-		}
-		else
-		{
-			if( ic )
-				irc_channel_free( ic );
-			
+		if( ( c = chat_add( irc, acc, cmd[3], channel ) ) )
+			irc_usermsg( irc, "Chatroom added successfully." );
+		else
 			irc_usermsg( irc, "Could not add chatroom." );
+		
+		g_free( channel );
+	}
+	else if( g_strcasecmp( cmd[1], "list" ) == 0 )
+	{
+		int i = 0;
+		
+		if( strchr( irc->umode, 'b' ) )
+			irc_usermsg( irc, "Chatroom list:" );
+		
+		for( c = irc->chatrooms; c; c = c->next )
+		{
+			irc_usermsg( irc, "%2d. %s(%s) %s, %s", i, c->acc->prpl->name,
+			                  c->acc->user, c->handle, c->channel );
+			
+			i ++;
+		}
+		irc_usermsg( irc, "End of chatroom list" );
+	}
+	else if( g_strcasecmp( cmd[1], "set" ) == 0 )
+	{
+		MIN_ARGS( 2 );
+		
+		cmd_set_real( irc, cmd + 1, cmd_chat_set_findhead, NULL );
+	}
+	else if( g_strcasecmp( cmd[1], "del" ) == 0 )
+	{
+		MIN_ARGS( 2 );
+		
+		if( ( c = chat_get( irc, cmd[2] ) ) )
+		{
+			chat_del( irc, c );
+		}
+		else
+		{
+			irc_usermsg( irc, "Could not remove chat." );
 		}
 	}
 	else if( g_strcasecmp( cmd[1], "with" ) == 0 )
 	{
-		irc_user_t *iu;
+		user_t *u;
 		
 		MIN_ARGS( 2 );
 		
-		if( ( iu = irc_user_by_name( irc, cmd[2] ) ) &&
-		    iu->bu && iu->bu->ic->acc->prpl->chat_with )
-		{
-			if( !iu->bu->ic->acc->prpl->chat_with( iu->bu->ic, iu->bu->handle ) )
+		if( ( u = user_find( irc, cmd[2] ) ) && u->ic && u->ic->acc->prpl->chat_with )
+		{
+			if( !u->ic->acc->prpl->chat_with( u->ic, u->handle ) )
 			{
 				irc_usermsg( irc, "(Possible) failure while trying to open "
-				                  "a groupchat with %s.", iu->nick );
+				                  "a groupchat with %s.", u->nick );
 			}
 		}
@@ -1147,5 +1204,5 @@
 			{
 				irc_usermsg( irc, "Rejecting file transfer for %s", file->file_name );
-				imcb_file_canceled( file->ic, file, "Denied by user" );
+				imcb_file_canceled( file, "Denied by user" );
 			}
 			break;
@@ -1154,5 +1211,5 @@
 			{
 				irc_usermsg( irc, "Canceling file transfer for %s", file->file_name );
-				imcb_file_canceled( file->ic, file, "Canceled by user" );
+				imcb_file_canceled( file, "Canceled by user" );
 			}
 			break;
@@ -1161,27 +1218,26 @@
 }
 
-/* IMPORTANT: Keep this list sorted! The short command logic needs that. */
 const command_t commands[] = {
+	{ "help",           0, cmd_help,           0 }, 
+	{ "identify",       1, cmd_identify,       0 },
+	{ "register",       1, cmd_register,       0 },
+	{ "drop",           1, cmd_drop,           0 },
 	{ "account",        1, cmd_account,        0 },
 	{ "add",            2, cmd_add,            0 },
+	{ "info",           1, cmd_info,           0 },
+	{ "rename",         2, cmd_rename,         0 },
+	{ "remove",         1, cmd_remove,         0 },
+	{ "block",          1, cmd_block,          0 },
 	{ "allow",          1, cmd_allow,          0 },
-	{ "blist",          0, cmd_blist,          0 },
-	{ "block",          1, cmd_block,          0 },
-	{ "channel",        1, cmd_channel,        0 },
-	{ "chat",           1, cmd_chat,           0 },
-	{ "drop",           1, cmd_drop,           0 },
-	{ "ft",             0, cmd_transfer,       0 },
-	{ "help",           0, cmd_help,           0 }, 
-	{ "identify",       1, cmd_identify,       0 },
-	{ "info",           1, cmd_info,           0 },
-	{ "no",             0, cmd_yesno,          0 },
-	{ "qlist",          0, cmd_qlist,          0 },
-	{ "register",       1, cmd_register,       0 },
-	{ "remove",         1, cmd_remove,         0 },
-	{ "rename",         2, cmd_rename,         0 },
 	{ "save",           0, cmd_save,           0 },
 	{ "set",            0, cmd_set,            0 },
+	{ "yes",            0, cmd_yesno,          0 },
+	{ "no",             0, cmd_yesno,          0 },
+	{ "blist",          0, cmd_blist,          0 },
+	{ "nick",           1, cmd_nick,           0 },
+	{ "qlist",          0, cmd_qlist,          0 },
+	{ "join_chat",      2, cmd_join_chat,      0 },
+	{ "chat",           1, cmd_chat,           0 },
 	{ "transfer",       0, cmd_transfer,       0 },
-	{ "yes",            0, cmd_yesno,          0 },
 	{ NULL }
 };
