Changeset e73e165


Ignore:
Timestamp:
2013-11-11T22:46:36Z (7 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:
1 edited

Legend:

Unmodified
Added
Removed
  • irc_channel.c

    r51f937e re73e165  
    3535{
    3636        irc_channel_t *ic;
     37        set_t *s;
    3738       
    3839        if( !irc_channel_name_ok( name ) || irc_channel_by_name( irc, name ) )
     
    4950       
    5051        set_add( &ic->set, "auto_join", "false", set_eval_bool, ic );
    51         set_add( &ic->set, "type", "control", set_eval_channel_type, ic );
     52       
     53        s = set_add( &ic->set, "type", "control", set_eval_channel_type, ic );
     54        s->flags |= SET_NOSAVE;    /* Layer violation (XML format detail) */
    5255       
    5356        if( name[0] == '&' )
Note: See TracChangeset for help on using the changeset viewer.