diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-30 00:44:17 +0100 | 
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-30 00:44:17 +0100 | 
| commit | 7a6ba50d4824c4e33ebf1154e97038c9331f4f58 (patch) | |
| tree | 93926be0405cd696661d23eef569b5ea0df4287e /storage_xml.c | |
| parent | 58646d9244557320ec811ee0b67519027170eede (diff) | |
Also allow selecting contacts for a channel by protocol instead of account.
If someone has two MSN accts and wants contacts from both in one channel,
this is now possible.
Diffstat (limited to 'storage_xml.c')
| -rw-r--r-- | storage_xml.c | 4 | 
1 files changed, 4 insertions, 0 deletions
| diff --git a/storage_xml.c b/storage_xml.c index f97b2cd5..a60769bb 100644 --- a/storage_xml.c +++ b/storage_xml.c @@ -218,6 +218,10 @@ static void xml_start_element( GMarkupParseContext *ctx, const gchar *element_na  			return;  		} +		/* The channel may exist already, for example if it's &bitlbee. +		   Also, it's possible that the user just reconnected and the +		   IRC client already rejoined all channels it was in. They +		   should still get the right settings. */  		if( ( xd->current_channel = irc_channel_by_name( irc, name ) ) ||  		    ( xd->current_channel = irc_channel_new( irc, name ) ) )  			set_setstr( &xd->current_channel->set, "type", type ); | 
