From c121f8945f7249520342ad86ff00f4986642ca0a Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Wed, 14 Jun 2006 22:30:25 +0200
Subject: xml_load() works pretty well now.

---
 root_commands.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'root_commands.c')

diff --git a/root_commands.c b/root_commands.c
index 0e12e9ab..d44a36b7 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -141,8 +141,9 @@ static void cmd_identify( irc_t *irc, char **cmd )
 		irc_usermsg( irc, "Password accepted" );
 		irc_umode_set( irc, "+R", 1 );
 		break;
+	case STORAGE_OTHER_ERROR:
 	default:
-		irc_usermsg( irc, "Something very weird happened" );
+		irc_usermsg( irc, "Unknown error while loading configuration" );
 		break;
 	}
 }
-- 
cgit v1.2.3


From 2b14eef99faf7e113cc6c17d68bf6402f87ddd66 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Wed, 21 Jun 2006 00:14:46 +0200
Subject: Implemented handling of autoconnect attribute.

---
 root_commands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'root_commands.c')

diff --git a/root_commands.c b/root_commands.c
index 225912b7..d263bb84 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -306,7 +306,7 @@ static void cmd_account( irc_t *irc, char **cmd )
 				irc_usermsg( irc, "Trying to get all accounts connected..." );
 			
 				for( a = irc->accounts; a; a = a->next )
-					if( !a->gc )
+					if( !a->gc && a->auto_connect )
 						account_on( irc, a );
 			} 
 			else
-- 
cgit v1.2.3


From 6ee9d2d65ec05d3871e69c2b03b860c6bdd509e9 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 25 Jun 2006 20:25:13 +0200
Subject: Forgot to initialize pass_rc4 (which caused memory management mess
 when trying to load a damaged XML-file).

---
 root_commands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'root_commands.c')

diff --git a/root_commands.c b/root_commands.c
index d263bb84..e69b9981 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -138,7 +138,7 @@ static void cmd_identify( irc_t *irc, char **cmd )
 		irc_usermsg( irc, "The nick is (probably) not registered" );
 		break;
 	case STORAGE_OK:
-		irc_usermsg( irc, "Password accepted" );
+		irc_usermsg( irc, "Password accepted, settings and accounts loaded" );
 		irc_umode_set( irc, "+R", 1 );
 		break;
 	case STORAGE_OTHER_ERROR:
-- 
cgit v1.2.3


From 90bbb0efeae19bcc6a1096d8c89fbf3981c83503 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Mon, 26 Jun 2006 18:50:47 +0200
Subject: Moved the call to "account on" to the right place.

---
 root_commands.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'root_commands.c')

diff --git a/root_commands.c b/root_commands.c
index e69b9981..47143531 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -126,9 +126,12 @@ static void cmd_help( irc_t *irc, char **cmd )
 	}
 }
 
+static void cmd_account( irc_t *irc, char **cmd );
+
 static void cmd_identify( irc_t *irc, char **cmd )
 {
 	storage_status_t status = storage_load( irc->nick, cmd[1], irc );
+	char *account_on[] = { "account", "on", NULL };
 	
 	switch (status) {
 	case STORAGE_INVALID_PASSWORD:
@@ -140,6 +143,8 @@ static void cmd_identify( irc_t *irc, char **cmd )
 	case STORAGE_OK:
 		irc_usermsg( irc, "Password accepted, settings and accounts loaded" );
 		irc_umode_set( irc, "+R", 1 );
+		if( set_getint( irc, "auto_connect" ) )
+			cmd_account( irc, account_on );
 		break;
 	case STORAGE_OTHER_ERROR:
 	default:
-- 
cgit v1.2.3


From 5c9512ffa716f2bc8bbf9e2c31ee40624a0ff842 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Fri, 30 Jun 2006 11:17:18 +0200
Subject: Made set.c API more generic so it's not specific to irc_t structures
 anymore, but can be used for account_t structures too, for example.

---
 root_commands.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'root_commands.c')

diff --git a/root_commands.c b/root_commands.c
index 47143531..815d618b 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -143,7 +143,7 @@ static void cmd_identify( irc_t *irc, char **cmd )
 	case STORAGE_OK:
 		irc_usermsg( irc, "Password accepted, settings and accounts loaded" );
 		irc_umode_set( irc, "+R", 1 );
-		if( set_getint( irc, "auto_connect" ) )
+		if( set_getint( &irc->set, "auto_connect" ) )
 			cmd_account( irc, account_on );
 		break;
 	case STORAGE_OTHER_ERROR:
@@ -671,14 +671,14 @@ static void cmd_set( irc_t *irc, char **cmd )
 {
 	if( cmd[1] && cmd[2] )
 	{
-		set_setstr( irc, cmd[1], cmd[2] );
+		set_setstr( &irc->set, cmd[1], cmd[2] );
 		
 		if( ( strcmp( cmd[2], "=" ) ) == 0 && cmd[3] )
 			irc_usermsg( irc, "Warning: Correct syntax: \002set <variable> <value>\002 (without =)" );
 	}
 	if( cmd[1] ) /* else 'forgotten' on purpose.. Must show new value after changing */
 	{
-		char *s = set_getstr( irc, cmd[1] );
+		char *s = set_getstr( &irc->set, cmd[1] );
 		if( s )
 			irc_usermsg( irc, "%s = `%s'", cmd[1], s );
 	}
-- 
cgit v1.2.3


From 0a3c243b6659dc10efb227e507f324c2711d6dcd Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 1 Jul 2006 01:18:56 +0200
Subject: Got rid of struct aim_user (now using account_t everywhere). Needs
 some more testing though.

---
 root_commands.c | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'root_commands.c')

diff --git a/root_commands.c b/root_commands.c
index 815d618b..3bd80e5e 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -399,14 +399,14 @@ static void cmd_add( irc_t *irc, char **cmd )
 		}
 		else
 		{
-			nick_set( irc, cmd[2], a->gc->prpl, cmd[3] );
+			nick_set( irc, cmd[2], a->gc->acc->prpl, cmd[3] );
 		}
 	}
 	
 	/* By making this optional, you can talk to people without having to
 	   add them to your *real* (server-side) contact list. */
 	if( add_for_real )
-		a->gc->prpl->add_buddy( a->gc, cmd[2] );
+		a->gc->acc->prpl->add_buddy( a->gc, cmd[2] );
 		
 	add_buddy( a->gc, NULL, cmd[2], cmd[2] );
 	
@@ -440,13 +440,13 @@ static void cmd_info( irc_t *irc, char **cmd )
 		return;
 	}
 	
-	if( !gc->prpl->get_info )
+	if( !gc->acc->prpl->get_info )
 	{
 		irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
 	}
 	else
 	{
-		gc->prpl->get_info( gc, cmd[2] );
+		gc->acc->prpl->get_info( gc, cmd[2] );
 	}
 }
 
@@ -481,7 +481,7 @@ static void cmd_rename( irc_t *irc, char **cmd )
 		}
 		else if( u->send_handler == buddy_send_handler )
 		{
-			nick_set( irc, u->handle, u->gc->prpl, cmd[2] );
+			nick_set( irc, u->handle, u->gc->acc->prpl, cmd[2] );
 		}
 		
 		irc_usermsg( irc, "Nick successfully changed" );
@@ -500,7 +500,7 @@ static void cmd_remove( irc_t *irc, char **cmd )
 	}
 	s = g_strdup( u->handle );
 	
-	u->gc->prpl->remove_buddy( u->gc, u->handle, NULL );
+	u->gc->acc->prpl->remove_buddy( u->gc, u->handle, NULL );
 	user_del( irc, cmd[1] );
 	nick_del( irc, cmd[1] );
 	
@@ -557,7 +557,7 @@ static void cmd_block( irc_t *irc, char **cmd )
 		return;
 	}
 	
-	if( !gc->prpl->add_deny || !gc->prpl->rem_permit )
+	if( !gc->acc->prpl->add_deny || !gc->acc->prpl->rem_permit )
 	{
 		irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
 	}
@@ -616,7 +616,7 @@ static void cmd_allow( irc_t *irc, char **cmd )
 		return;
 	}
 	
-	if( !gc->prpl->rem_deny || !gc->prpl->add_permit )
+	if( !gc->acc->prpl->rem_deny || !gc->acc->prpl->add_permit )
 	{
 		irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
 	}
@@ -732,7 +732,7 @@ static void cmd_blist( irc_t *irc, char **cmd )
 	{
 		if( online == 1 )
 		{
-			g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+			g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->acc->prpl->name );
 			irc_usermsg( irc, format, u->nick, s, "Online" );
 		}
 		
@@ -743,7 +743,7 @@ static void cmd_blist( irc_t *irc, char **cmd )
 	{
 		if( away == 1 )
 		{
-			g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+			g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->acc->prpl->name );
 			irc_usermsg( irc, format, u->nick, s, u->away );
 		}
 		n_away ++;
@@ -753,7 +753,7 @@ static void cmd_blist( irc_t *irc, char **cmd )
 	{
 		if( offline == 1 )
 		{
-			g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+			g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->acc->prpl->name );
 			irc_usermsg( irc, format, u->nick, s, "Offline" );
 		}
 		n_offline ++;
@@ -778,7 +778,7 @@ static void cmd_nick( irc_t *irc, char **cmd )
 	{
 		irc_usermsg( irc, "Your name is `%s'" , a->gc->displayname ? a->gc->displayname : "NULL" );
 	}
-	else if ( !a->gc->prpl->set_info ) 
+	else if ( !a->prpl->set_info ) 
 	{
 		irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
 	}
@@ -786,7 +786,7 @@ static void cmd_nick( irc_t *irc, char **cmd )
 	{
 		irc_usermsg( irc, "Setting your name to `%s'", cmd[2] );
 		
-		a->gc->prpl->set_info( a->gc, cmd[2] );
+		a->prpl->set_info( a->gc, cmd[2] );
 	}
 }
 
@@ -805,7 +805,7 @@ static void cmd_qlist( irc_t *irc, char **cmd )
 	
 	for( num = 0; q; q = q->next, num ++ )
 		if( q->gc ) /* Not necessary yet, but it might come later */
-			irc_usermsg( irc, "%d, %s(%s): %s", num, q->gc->prpl->name, q->gc->username, q->question );
+			irc_usermsg( irc, "%d, %s(%s): %s", num, q->gc->acc->prpl->name, q->gc->username, q->question );
 		else
 			irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
 }
@@ -833,10 +833,11 @@ static void cmd_import_buddies( irc_t *irc, char **cmd )
 		{
 			user_t *u;
 			
+			/* FIXME: Hmmm, this is actually pretty dangerous code... REMOVEME? :-) */
 			for( u = irc->users; u; u = u->next )
 				if( u->gc == gc )
 				{
-					u->gc->prpl->remove_buddy( u->gc, u->handle, NULL );
+					u->gc->acc->prpl->remove_buddy( u->gc, u->handle, NULL );
 					user_del( irc, u->nick );
 				}
 			
@@ -851,9 +852,9 @@ static void cmd_import_buddies( irc_t *irc, char **cmd )
 	
 	for( n = gc->irc->nicks; n; n = n->next )
 	{
-		if( n->proto == gc->prpl && !user_findhandle( gc, n->handle ) )
+		if( n->proto == gc->acc->prpl && !user_findhandle( gc, n->handle ) )
 		{
-	                gc->prpl->add_buddy( gc, n->handle );
+	                gc->acc->prpl->add_buddy( gc, n->handle );
 	                add_buddy( gc, NULL, n->handle, NULL );
 		}
 	}
-- 
cgit v1.2.3


From 5100caa16bb707d89f1873aca99b5f87abc1dd56 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 1 Jul 2006 17:52:05 +0200
Subject: Added "account set" command.

---
 root_commands.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 67 insertions(+), 2 deletions(-)

(limited to 'root_commands.c')

diff --git a/root_commands.c b/root_commands.c
index 3bd80e5e..b975b0f4 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -231,9 +231,8 @@ static void cmd_account( irc_t *irc, char **cmd )
 		}
 
 		a = account_add( irc, prpl, cmd[3], cmd[4] );
-		
 		if( cmd[5] )
-			a->server = g_strdup( cmd[5] );
+			set_setstr( &a->set, "server", cmd[5] );
 		
 		irc_usermsg( irc, "Account successfully added" );
 	}
@@ -357,6 +356,68 @@ static void cmd_account( irc_t *irc, char **cmd )
 			return;
 		}
 	}
+	else if( g_strcasecmp( cmd[1], "set" ) == 0 )
+	{
+		char *acc_handle, *set_name = NULL, *tmp;
+		
+		if( !cmd[2] )
+		{
+			irc_usermsg( irc, "Not enough parameters given (need %d)", 2 );
+			return;
+		}
+		
+		acc_handle = g_strdup( cmd[2] );
+		if( ( tmp = strchr( acc_handle, '/' ) ) )
+		{
+			*tmp = 0;
+			set_name = tmp + 1;
+		}
+		a = account_get( irc, acc_handle );
+		
+		if( a == NULL )
+		{
+			irc_usermsg( irc, "Invalid account" );
+			return;
+		}
+		
+		if( cmd[3] )
+		{
+			set_t *s = set_find( &a->set, set_name );
+			
+			if( a->gc && s && s->flags & ACC_SET_OFFLINE_ONLY )
+			{
+				irc_usermsg( irc, "This setting can only be changed when the account is off-line" );
+				return;
+			}
+			
+			set_setstr( &a->set, set_name, cmd[3] );
+			
+			if( ( strcmp( cmd[3], "=" ) ) == 0 && cmd[4] )
+				irc_usermsg( irc, "Warning: Correct syntax: \002account set <variable> <value>\002 (without =)" );
+		}
+		if( set_name ) /* else 'forgotten' on purpose.. Must show new value after changing */
+		{
+			char *s = set_getstr( &a->set, set_name );
+			if( s )
+				irc_usermsg( irc, "%s = `%s'", set_name, s );
+			else
+				irc_usermsg( irc, "%s is empty", set_name );
+		}
+		else
+		{
+			set_t *s = a->set;
+			while( s )
+			{
+				if( s->value || s->def )
+					irc_usermsg( irc, "%s = `%s'", s->key, s->value?s->value:s->def );
+				else
+					irc_usermsg( irc, "%s is empty", s->key );
+				s = s->next;
+			}
+		}
+		
+		g_free( acc_handle );
+	}
 	else
 	{
 		irc_usermsg( irc, "Unknown command: account %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[1] );
@@ -681,6 +742,8 @@ static void cmd_set( irc_t *irc, char **cmd )
 		char *s = set_getstr( &irc->set, cmd[1] );
 		if( s )
 			irc_usermsg( irc, "%s = `%s'", cmd[1], s );
+		else
+			irc_usermsg( irc, "%s is empty", cmd[1] );
 	}
 	else
 	{
@@ -689,6 +752,8 @@ static void cmd_set( irc_t *irc, char **cmd )
 		{
 			if( s->value || s->def )
 				irc_usermsg( irc, "%s = `%s'", s->key, s->value?s->value:s->def );
+			else
+				irc_usermsg( irc, "%s is empty", s->key );
 			s = s->next;
 		}
 	}
-- 
cgit v1.2.3


From 911f2eb7060f6af6fe8e4e02144cfb7c4bb4cc8b Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Mon, 3 Jul 2006 01:20:27 +0200
Subject: Added display_name setting for MSN connections. (Should replace the
 nick command later.)

---
 root_commands.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'root_commands.c')

diff --git a/root_commands.c b/root_commands.c
index b975b0f4..42e113ed 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -386,7 +386,12 @@ static void cmd_account( irc_t *irc, char **cmd )
 			
 			if( a->gc && s && s->flags & ACC_SET_OFFLINE_ONLY )
 			{
-				irc_usermsg( irc, "This setting can only be changed when the account is off-line" );
+				irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "off" );
+				return;
+			}
+			else if( !a->gc && s && s->flags & ACC_SET_ONLINE_ONLY )
+			{
+				irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "on" );
 				return;
 			}
 			
-- 
cgit v1.2.3


From 5b52a4895e5a59ff6509f7771f4d8665737688c3 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Mon, 3 Jul 2006 23:22:45 +0200
Subject: Implemented per-account nick lists instead of per-protocol nick
 lists. nick_t is dead, instead nicks are just saves in a per-account_t GLib
 hash table. While doing this, the import_buddies command finally died and
 text_save() disappeared, because the old file format can't handle most of the
 new features in this branch anyway.

Still have to implement support for the new nick lists in text_load()!
---
 root_commands.c | 59 +++------------------------------------------------------
 1 file changed, 3 insertions(+), 56 deletions(-)

(limited to 'root_commands.c')

diff --git a/root_commands.c b/root_commands.c
index 42e113ed..2cf67134 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -465,7 +465,7 @@ static void cmd_add( irc_t *irc, char **cmd )
 		}
 		else
 		{
-			nick_set( irc, cmd[2], a->gc->acc->prpl, cmd[3] );
+			nick_set( a, cmd[2], cmd[3] );
 		}
 	}
 	
@@ -547,7 +547,7 @@ static void cmd_rename( irc_t *irc, char **cmd )
 		}
 		else if( u->send_handler == buddy_send_handler )
 		{
-			nick_set( irc, u->handle, u->gc->acc->prpl, cmd[2] );
+			nick_set( u->gc->acc, u->handle, cmd[2] );
 		}
 		
 		irc_usermsg( irc, "Nick successfully changed" );
@@ -568,7 +568,7 @@ static void cmd_remove( irc_t *irc, char **cmd )
 	
 	u->gc->acc->prpl->remove_buddy( u->gc, u->handle, NULL );
 	user_del( irc, cmd[1] );
-	nick_del( irc, cmd[1] );
+	nick_del( u->gc->acc, u->handle );
 	
 	irc_usermsg( irc, "Buddy `%s' (nick %s) removed from contact list", s, cmd[1] );
 	g_free( s );
@@ -880,58 +880,6 @@ static void cmd_qlist( irc_t *irc, char **cmd )
 			irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
 }
 
-static void cmd_import_buddies( irc_t *irc, char **cmd )
-{
-	struct gaim_connection *gc;
-	account_t *a;
-	nick_t *n;
-	
-	if( !( a = account_get( irc, cmd[1] ) ) )
-	{
-		irc_usermsg( irc, "Invalid account" );
-		return;
-	}
-	else if( !( ( gc = a->gc ) && ( a->gc->flags & OPT_LOGGED_IN ) ) )
-	{
-		irc_usermsg( irc, "That account is not on-line" );
-		return;
-	}
-	
-	if( cmd[2] )
-	{
-		if( g_strcasecmp( cmd[2], "clear" ) == 0 )
-		{
-			user_t *u;
-			
-			/* FIXME: Hmmm, this is actually pretty dangerous code... REMOVEME? :-) */
-			for( u = irc->users; u; u = u->next )
-				if( u->gc == gc )
-				{
-					u->gc->acc->prpl->remove_buddy( u->gc, u->handle, NULL );
-					user_del( irc, u->nick );
-				}
-			
-			irc_usermsg( irc, "Old buddy list cleared." );
-		}
-		else
-		{
-			irc_usermsg( irc, "Invalid argument: %s", cmd[2] );
-			return;
-		}
-	}
-	
-	for( n = gc->irc->nicks; n; n = n->next )
-	{
-		if( n->proto == gc->acc->prpl && !user_findhandle( gc, n->handle ) )
-		{
-	                gc->acc->prpl->add_buddy( gc, n->handle );
-	                add_buddy( gc, NULL, n->handle, NULL );
-		}
-	}
-	
-	irc_usermsg( irc, "Sent all add requests. Please wait for a while, the server needs some time to handle all the adds." );
-}
-
 const command_t commands[] = {
 	{ "help",           0, cmd_help,           0 }, 
 	{ "identify",       1, cmd_identify,       0 },
@@ -950,7 +898,6 @@ const command_t commands[] = {
 	{ "no",             0, cmd_yesno,          0 },
 	{ "blist",          0, cmd_blist,          0 },
 	{ "nick",           1, cmd_nick,           0 },
-	{ "import_buddies", 1, cmd_import_buddies, 0 },
 	{ "qlist",          0, cmd_qlist,          0 },
 	{ NULL }
 };
-- 
cgit v1.2.3


From 75a4b85ea060c5b63e9742ee9d1591bd618ba5c2 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Fri, 14 Jul 2006 11:25:48 +0200
Subject: Fixed a memory leak, added a check for valid Jabber handles, and
 updated documentation (added information about "account set" and sorted the
 list of settings because it was a bit too random).

---
 root_commands.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'root_commands.c')

diff --git a/root_commands.c b/root_commands.c
index 2cf67134..389266eb 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -376,6 +376,7 @@ static void cmd_account( irc_t *irc, char **cmd )
 		
 		if( a == NULL )
 		{
+			g_free( acc_handle );
 			irc_usermsg( irc, "Invalid account" );
 			return;
 		}
@@ -386,11 +387,13 @@ static void cmd_account( irc_t *irc, char **cmd )
 			
 			if( a->gc && s && s->flags & ACC_SET_OFFLINE_ONLY )
 			{
+				g_free( acc_handle );
 				irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "off" );
 				return;
 			}
 			else if( !a->gc && s && s->flags & ACC_SET_ONLINE_ONLY )
 			{
+				g_free( acc_handle );
 				irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "on" );
 				return;
 			}
-- 
cgit v1.2.3


From 2811940d678bd9340055e08a0462c21e710d5714 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Thu, 27 Jul 2006 16:55:53 +0200
Subject: Copy-paste considered harmful + Fixed double handling of
 gc->permit/deny which actually broke the block/allow commands.

---
 root_commands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'root_commands.c')

diff --git a/root_commands.c b/root_commands.c
index 3d3584b3..040d885c 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -579,7 +579,7 @@ static void cmd_allow( irc_t *irc, char **cmd )
 			format = "%-32.32s  %-16.16s";
 		
 		irc_usermsg( irc, format, "Handle", "Nickname" );
-		for( l = a->gc->deny; l; l = l->next )
+		for( l = a->gc->permit; l; l = l->next )
 		{
 			user_t *u = user_findhandle( a->gc, l->data );
 			irc_usermsg( irc, format, l->data, u ? u->nick : "(none)" );
-- 
cgit v1.2.3


From d5ccd83c5235528df2481003502647b86b41fdc4 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 13 Aug 2006 21:15:23 +0200
Subject: Extra comments in set.h and now properly using set_getbool() instead
 of set_getint().

---
 root_commands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'root_commands.c')

diff --git a/root_commands.c b/root_commands.c
index 389266eb..13567e8a 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -143,7 +143,7 @@ static void cmd_identify( irc_t *irc, char **cmd )
 	case STORAGE_OK:
 		irc_usermsg( irc, "Password accepted, settings and accounts loaded" );
 		irc_umode_set( irc, "+R", 1 );
-		if( set_getint( &irc->set, "auto_connect" ) )
+		if( set_getbool( &irc->set, "auto_connect" ) )
 			cmd_account( irc, account_on );
 		break;
 	case STORAGE_OTHER_ERROR:
-- 
cgit v1.2.3


From 0383943c38ee308805798974bfccbd3327369c6a Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Fri, 25 Aug 2006 00:06:52 +0200
Subject: Added message on successful creation of accounts and fixed "set
 password" command.

---
 root_commands.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'root_commands.c')

diff --git a/root_commands.c b/root_commands.c
index 13567e8a..3097dc81 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -168,6 +168,7 @@ static void cmd_register( irc_t *irc, char **cmd )
 			break;
 			
 		case STORAGE_OK:
+			irc_usermsg( irc, "Account successfully created" );
 			irc->status |= USTATUS_IDENTIFIED;
 			irc_umode_set( irc, "+R", 1 );
 			break;
-- 
cgit v1.2.3


From 3ef6410bab141e5c6ea465730a37289991c38f9f Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 15 Oct 2006 11:26:06 +0200
Subject: Removed a reference to an already free()d variable from cmd_remove().

---
 root_commands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'root_commands.c')

diff --git a/root_commands.c b/root_commands.c
index 3097dc81..64dc71b9 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -572,7 +572,7 @@ static void cmd_remove( irc_t *irc, char **cmd )
 	
 	u->gc->acc->prpl->remove_buddy( u->gc, u->handle, NULL );
 	user_del( irc, cmd[1] );
-	nick_del( u->gc->acc, u->handle );
+	nick_del( u->gc->acc, s );
 	
 	irc_usermsg( irc, "Buddy `%s' (nick %s) removed from contact list", s, cmd[1] );
 	g_free( s );
-- 
cgit v1.2.3