Ignore:
Timestamp:
2018-03-10T11:30:39Z (7 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Children:
5447c59
Parents:
3f44e43 (diff), 4a9c6b0 (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:

Merge branch 'master' into HEAD

File:
1 edited

Legend:

Unmodified
Added
Removed

  • tests/check_jabber_util.c

    r3f44e43 r7a9d968  
    3737        fail_unless(jabber_buddy_by_jid(ic, "wilmer@GAAST.NET/BitlBee", GET_BUDDY_CREAT) == budw1);
    3838
    39         fail_unless(jabber_buddy_by_jid(ic, "wilmer@gaast.net", GET_BUDDY_EXACT));
     39        fail_unless(jabber_buddy_by_jid(ic, "wilmer@gaast.net", GET_BUDDY_EXACT) != NULL);
    4040        fail_unless(jabber_buddy_by_jid(ic, "WILMER@gaast.net", 0) == budw3);
    4141
    … …  
    8383        fail_if(jabber_buddy_remove(ic, "nekkid@lamejab.net/Illegal"));
    8484        fail_unless(jabber_buddy_remove(ic, "nekkid@lamejab.net"));
    85         fail_if(jabber_buddy_by_jid(ic, "nekkid@lamejab.net", 0));
     85        fail_if(jabber_buddy_by_jid(ic, "nekkid@lamejab.net", 0) != NULL);
    8686
    8787        /* Fixing a bug in this branch that caused information to get lost when
Note: See TracChangeset for help on using the changeset viewer.