Changeset 08e5bb2 for protocols


Ignore:
Timestamp:
2009-11-19T18:50:53Z (15 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
be609ff
Parents:
20e830b
Message:

Restoring some logic that seemed broken but was important with handling
of chatrooms (and likely more things). The restored version is somewhat
less confusing.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • protocols/jabber/jabber_util.c

    r20e830b r08e5bb2  
    420420        if( ( s = strchr( jid, '/' ) ) )
    421421        {
     422                int bare_exists = 0;
     423               
    422424                *s = 0;
    423425                if( ( bud = g_hash_table_lookup( jd->buddies, jid ) ) )
    424426                {
     427                        bare_exists = 1;
     428                       
    425429                        if( bud->next )
    426430                                bud = bud->next;
    … …  
    448452                }
    449453               
    450                 if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && imcb_find_buddy( ic, jid ) )
     454                if( bud == NULL && ( flags & GET_BUDDY_CREAT ) &&
     455                    ( imcb_find_buddy( ic, jid ) || bare_exists ) )
    451456                {
    452457                        *s = '/';
Note: See TracChangeset for help on using the changeset viewer.