Changeset 4022b68 for irc.c

Timestamp:

2010-08-21T22:42:01Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fd424c8

Parents:

327af51 (diff), c00dd71 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline.

File:

• irc.c (modified) (4 diffs)

irc.c

@@ -103 +103 @@
         s = set_add( &b->set, "allow_takeover", "true", set_eval_bool, irc );
         s = set_add( &b->set, "away_devoice", "true", set_eval_bw_compat, irc );
+        s->flags |= SET_HIDDEN;
         s = set_add( &b->set, "away_reply_timeout", "3600", set_eval_int, irc );
         s = set_add( &b->set, "charset", "utf-8", set_eval_charset, irc );
@@ -109 +110 @@
         s = set_add( &b->set, "display_timestamps", "true", set_eval_bool, irc );
         s = set_add( &b->set, "handle_unknown", "add_channel", NULL, irc );
+        s = set_add( &b->set, "last_version", NULL, NULL, irc );
+        s->flags |= SET_HIDDEN;
         s = set_add( &b->set, "lcnicks", "true", set_eval_bool, irc );
         s = set_add( &b->set, "nick_format", "%-@nick", NULL, irc );
@@ -122 +125 @@
         s = set_add( &b->set, "query_order", "lifo", NULL, irc );
         s = set_add( &b->set, "root_nick", ROOT_NICK, set_eval_root_nick, irc );
+        s->flags |= SET_HIDDEN;
         s = set_add( &b->set, "show_offline", "false", set_eval_bw_compat, irc );
+        s->flags |= SET_HIDDEN;
         s = set_add( &b->set, "simulate_netsplit", "true", set_eval_bool, irc );
         s = set_add( &b->set, "timezone", "local", set_eval_timezone, irc );
@@ -915 +920 @@
                 val = "online@,away+,offline";
         else
-                return SET_INVALID;
+                val = "online+,away";
         
         for( l = irc->channels; l; l = l->next )