Changeset 8e9e2b7 for protocols/jabber


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/conference.c

    r88de0c9 r8e9e2b7  
    312312        char *s;
    313313       
     314        if( subject && chat )
     315        {
     316                s = bud ? strchr( bud->ext_jid, '/' ) : NULL;
     317                if( s ) *s = 0;
     318                imcb_chat_topic( chat, bud ? bud->ext_jid : NULL, subject->text_len > 0 ?
     319                                 subject->text : NULL, jabber_get_timestamp( node ) );
     320                if( s ) *s = '/';
     321        }
     322       
    314323        if( bud == NULL || ( jc && ~jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me ) )
    315324        {
     
    366375                return;
    367376        }
    368        
    369         if( subject )
    370         {
    371                 s = strchr( bud->ext_jid, '/' );
    372                 if( s ) *s = 0;
    373                 imcb_chat_topic( chat, bud->ext_jid, subject->text_len > 0 ?
    374                                  subject->text : NULL, jabber_get_timestamp( node ) );
    375                 if( s ) *s = '/';
    376         }
    377377        if( body && body->text_len > 0 )
    378378        {
Note: See TracChangeset for help on using the changeset viewer.