Changeset b556e46 for irc_user.c


Ignore:
Timestamp:
2010-07-09T23:25:07Z (10 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
f3b6764
Parents:
c5bff81 (diff), 9a9b520 (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 main ui-fix.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • irc_user.c

    rc5bff81 rb556e46  
    121121{
    122122        irc_t *irc = iu->irc;
     123        irc_user_t *new_iu;
    123124        char key[strlen(new)+1];
    124125        GSList *cl;
    125126       
    126127        strcpy( key, new );
    127         if( iu == NULL || !nick_lc( key ) || irc_user_by_name( irc, new ) )
     128        if( iu == NULL || !nick_lc( key ) ||
     129            ( ( new_iu = irc_user_by_name( irc, new ) ) && new_iu != iu ) )
    128130                return 0;
    129131       
Note: See TracChangeset for help on using the changeset viewer.