Changes in protocols/jabber/conference.c [58f5ef7:41e0c00]

File:

• protocols/jabber/conference.c (modified) (3 diffs)

protocols/jabber/conference.c

@@ -274 +274 @@
                 }
                 
-                if( bud != jc->me )
-                {
+                if( bud != jc->me && bud->flags & JBFLAG_IS_ANONYMOUS )
+                {
+                        /* If JIDs are anonymized, add them to the local
+                           list for the duration of this chat. */
                         imcb_add_buddy( ic, bud->ext_jid, NULL );
                         imcb_buddy_nick_hint( ic, bud->ext_jid, bud->resource );
@@ -309 +311 @@
         struct jabber_chat *jc = chat ? chat->data : NULL;
         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 ) )
@@ -364 +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 )
         {