Changeset 41e0c00

Timestamp:

2010-09-05T10:27:12Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fef7813

Parents:

52d63dc

Message:

Fixing handling of (Jabber) chatroom topic changes done by the user.

Files:

• irc_im.c (modified) (1 diff)
• protocols/jabber/conference.c (modified) (2 diffs)

irc_im.c

@@ -798 +798 @@
                 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;
 }

protocols/jabber/conference.c

@@ -312 +312 @@
         char *s;
         
+        if( subject && chat )
+        {
+                s = bud ? strchr( bud->ext_jid, '/' ) : NULL;
+                if( s ) *s = 0;
+                imcb_chat_topic( chat, bud ? bud->ext_jid : NULL, subject->text_len > 0 ?
+                                 subject->text : NULL, jabber_get_timestamp( node ) );
+                if( s ) *s = '/';
+        }
+        
         if( bud == NULL || ( jc && ~jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me ) )
         {
@@ -366 +375 @@
                 return;
         }
-        
-        if( subject )
-        {
-                s = strchr( bud->ext_jid, '/' );
-                if( s ) *s = 0;
-                imcb_chat_topic( chat, bud->ext_jid, subject->text_len > 0 ?
-                                 subject->text : NULL, jabber_get_timestamp( node ) );
-                if( s ) *s = '/';
-        }
         if( body && body->text_len > 0 )
         {