Changeset 8e9e2b7 for irc_im.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_im.c (modified) (3 diffs)

irc_im.c

@@ -590 +590 @@
         irc_channel_t *ic = c->ui_data;
         
-        if( ic == NULL )
+        if( ic == NULL || bu == NULL )
                 return FALSE;
         
@@ -753 +753 @@
                 {
                         *s = '\0';
-                        if( ( iu = irc_user_by_name( ic->irc, nick ) ) &&
+                        if( ( iu = irc_user_by_name( ic->irc, nick ) ) && iu->bu &&
                             iu->bu->nick && irc_channel_has_user( ic, iu ) )
                         {
@@ -858 +858 @@
                 c->ic->acc->prpl->chat_topic( c, topic );
                 g_free( topic );
-                return TRUE;
-        }
-                
+        }
+                
+        /* Whatever happened, the IM module should ack the topic change. */
         return FALSE;
 }