Changeset 8e9e2b7 for protocols/jabber/conference.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:

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

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 )
         {