Added one TODO, and also dupe-check channel names against the control

channel.

2 files changed, 5 insertions, 0 deletions

diff --git a/chat.c b/chat.c
index 41de1401..a786794e 100644
--- a/chat.c
+++ b/chat.c
@@ -33,6 +33,9 @@ struct chat *chat_add( irc_t *irc, account_t *acc, char *handle, char *channel )
 	if( !chat_chanok( channel ) )
 		return NULL;
 	
+	if( chat_chancmp( channel, irc->channel ) == 0 )
+		return NULL;
+	
 	for( c = irc->chatrooms; c; c = c->next )
 	{
 		if( chat_chancmp( channel, c->channel ) == 0 )
diff --git a/root_commands.c b/root_commands.c
index 89fc4776..83620173 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -301,6 +301,8 @@ static int cmd_set_real( irc_t *irc, char **cmd, cmd_set_findhead findhead )
 		int st;
 		
 		/*
+		FIXME: Make these work again. Probably a gross hack.
+		
 		if( a->ic && s && s->flags & ACC_SET_OFFLINE_ONLY )
 		{
 			irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "off" );