Changeset e73e165

Timestamp:

2013-11-11T22:46:36Z (11 years ago)

Author:

unknown <pesco@…>

Branches:

master

Children:

434a2d0

Parents:

51f937e (diff), d4a4f1a (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 upstream

File:

• irc_channel.c (modified) (2 diffs)

irc_channel.c

@@ -35 +35 @@
 {
         irc_channel_t *ic;
+        set_t *s;
         
         if( !irc_channel_name_ok( name ) || irc_channel_by_name( irc, name ) )
@@ -49 +50 @@
         
         set_add( &ic->set, "auto_join", "false", set_eval_bool, ic );
-        set_add( &ic->set, "type", "control", set_eval_channel_type, ic );
+        
+        s = set_add( &ic->set, "type", "control", set_eval_channel_type, ic );
+        s->flags |= SET_NOSAVE;    /* Layer violation (XML format detail) */
         
         if( name[0] == '&' )