Changeset 8e9e2b7 for irc_channel.c

Timestamp:

2010-10-03T02:45:26Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

04f0c10

Parents:

88de0c9 (diff), 2af3e23 (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:

Merging mainline, which includes a huge msnp13 merge.

Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.

File:

• irc_channel.c (modified) (1 diff)

irc_channel.c

@@ -192 +192 @@
         if( strcmp( value, "control" ) == 0 )
                 new = &control_channel_funcs;
-        else if( strcmp( value, "chat" ) == 0 )
+        else if( ic != ic->irc->default_channel && strcmp( value, "chat" ) == 0 )
                 new = &irc_channel_im_chat_funcs;
         else