Changeset 0a6e5d1

Timestamp:

2010-06-07T15:51:31Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a4d920b

Parents:

70f69ecc

Message:

Restore "set root_nick" behaviour. All disabled set evaluators are back
now. Getting *very* close to "feature parity" now!

Files:

• irc.c (modified) (1 diff)
• root_commands.c (modified) (1 diff)

irc.c

@@ -116 +116 @@
         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 );
+        s = set_add( &b->set, "root_nick", ROOT_NICK, set_eval_root_nick, irc );
         s = set_add( &b->set, "simulate_netsplit", "true", set_eval_bool, irc );
         s = set_add( &b->set, "timezone", "local", set_eval_timezone, irc );

root_commands.c

@@ -719 +719 @@
 }
 
-#if 0
 char *set_eval_root_nick( set_t *set, char *new_nick )
 {
         irc_t *irc = set->data;
         
-        if( strcmp( irc->mynick, new_nick ) != 0 )
-        {
-                char *cmd[] = { "set_rename", irc->mynick, new_nick, NULL };
+        if( strcmp( irc->root->nick, new_nick ) != 0 )
+        {
+                char *cmd[] = { "set_rename", irc->root->nick, new_nick, NULL };
                 
                 cmd_rename( irc, cmd );
         }
         
-        return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : SET_INVALID;
-}
-#endif
+        return strcmp( irc->root->nick, new_nick ) == 0 ? new_nick : SET_INVALID;
+}
 
 static void cmd_block( irc_t *irc, char **cmd )