Changeset 0d9d53e

Timestamp:

2010-06-07T00:58:07Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4aa0f6b

Parents:

36562b0

Message:

Fixed "set password" and "set auto_reconnect_delay".

Files:

• irc.c (modified) (3 diffs)
• protocols/bee.c (modified) (1 diff)

irc.c

@@ -31 +31 @@
 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 )
@@ -110 +111 @@
         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 );
@@ -272 +275 @@
         } else {
                 irc->password = NULL;
+        }
+}
+
+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;
         }
 }

protocols/bee.c

@@ -38 +38 @@
         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 );