Fixed "set password" and "set auto_reconnect_delay".

2 files changed, 19 insertions, 3 deletions

diff --git a/irc.c b/irc.c
index 49395ee4..6862b6fb 100644
--- a/irc.c
+++ b/irc.c
@@ -30,6 +30,7 @@ GSList *irc_connection_list;
 
 static gboolean irc_userping( gpointer _irc, gint fd, b_input_condition cond );
 static char *set_eval_charset( set_t *set, char *value );
+static char *set_eval_password( set_t *set, char *value );
 
 irc_t *irc_new( int fd )
 {
@@ -109,6 +110,8 @@ irc_t *irc_new( int fd )
 	s->old_key = g_strdup( "buddy_sendbuffer" );
 	s = set_add( &b->set, "paste_buffer_delay", "200", set_eval_int, irc );
 	s->old_key = g_strdup( "buddy_sendbuffer_delay" );
+	s = set_add( &b->set, "password", NULL, set_eval_password, irc );
+	s->flags |= SET_NULL_OK;
 	s = set_add( &b->set, "private", "true", set_eval_bool, irc );
 	s = set_add( &b->set, "query_order", "lifo", NULL, irc );
 	s = set_add( &b->set, "root_nick", ROOT_NICK, NULL/*set_eval_root_nick*/, irc );
@@ -274,6 +277,21 @@ void irc_setpass (irc_t *irc, const char *pass)
 	}
 }
 
+static char *set_eval_password( set_t *set, char *value )
+{
+	irc_t *irc = set->data;
+	
+	if( irc->status & USTATUS_IDENTIFIED && value )
+	{
+		irc_setpass( irc, value );
+		return NULL;
+	}
+	else
+	{
+		return SET_INVALID;
+	}
+}
+
 static char **irc_splitlines( char *buffer );
 
 void irc_process( irc_t *irc )
diff --git a/protocols/bee.c b/protocols/bee.c
index 471ce02a..c5eeee17 100644
--- a/protocols/bee.c
+++ b/protocols/bee.c
@@ -37,10 +37,8 @@ bee_t *bee_new()
 	s->flags |= SET_NULL_OK;
 	s = set_add( &b->set, "auto_connect", "true", set_eval_bool, b );
 	s = set_add( &b->set, "auto_reconnect", "true", set_eval_bool, b );
-	s = set_add( &b->set, "auto_reconnect_delay", "5*3<900", NULL/*set_eval_account_reconnect_delay*/, b );
+	s = set_add( &b->set, "auto_reconnect_delay", "5*3<900", set_eval_account_reconnect_delay, b );
 	s = set_add( &b->set, "debug", "false", set_eval_bool, b );
-	s = set_add( &b->set, "password", NULL, NULL/*set_eval_password*/, b );
-	s->flags |= SET_NULL_OK;
 	s = set_add( &b->set, "save_on_quit", "true", set_eval_bool, b );
 	s = set_add( &b->set, "status", NULL, set_eval_away_status, b );
 	s->flags |= SET_NULL_OK;