diff options
| author | Marius Halden <marius.h@lden.org> | 2017-10-24 21:06:04 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2017-10-24 21:06:04 +0200 |
| commit | 965d0c895a82f9e96fd2d717d2b28ab31fc09b5a (patch) | |
| tree | 30b9eafb992785db21e7f149425589040f781a28 | |
| parent | f849ef86076ed17c9dbaeeb425dba084dc9c52ba (diff) | |
| parent | 861de54f5a71fc7a1b27434e1618e79617b6e072 (diff) | |
Merge branch 'master' into patched-master
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | otr.c | 4 | ||||
| -rw-r--r-- | tests/check_jabber_util.c | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 9162ca4c..67eb4aa1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -sudo: false +dist: precise language: c script: @@ -30,6 +30,9 @@ addons: - check - libpam0g-dev - libldap2-dev + - fakeroot + - debhelper + - devscripts coverity_scan: project: name: "bitlbee/bitlbee" @@ -877,13 +877,13 @@ void op_handle_smp_event(void *opdata, OtrlSMPEvent ev, ConnContext *ctx, switch (ev) { case OTRL_SMPEVENT_ASK_FOR_SECRET: irc_rootmsg(irc, "smp: initiated by %s" - " - respond with \x02otr smp %s <secret>\x02", + " - respond with \x02otr smp %s \"<secret>\"\x02", u->nick, u->nick); break; case OTRL_SMPEVENT_ASK_FOR_ANSWER: irc_rootmsg(irc, "smp: initiated by %s with question: \x02\"%s\"\x02", u->nick, question); - irc_rootmsg(irc, "smp: respond with \x02otr smp %s <answer>\x02", + irc_rootmsg(irc, "smp: respond with \x02otr smp %s \"<answer>\"\x02", u->nick); break; case OTRL_SMPEVENT_CHEATED: diff --git a/tests/check_jabber_util.c b/tests/check_jabber_util.c index 43180fce..e4d4533a 100644 --- a/tests/check_jabber_util.c +++ b/tests/check_jabber_util.c @@ -36,7 +36,7 @@ static void check_buddy_add(int l) fail_unless(jabber_buddy_by_jid(ic, "WILMER@GAAST.NET/BitlBee", GET_BUDDY_EXACT) == budw1); fail_unless(jabber_buddy_by_jid(ic, "wilmer@GAAST.NET/BitlBee", GET_BUDDY_CREAT) == budw1); - fail_unless(jabber_buddy_by_jid(ic, "wilmer@gaast.net", GET_BUDDY_EXACT)); + fail_unless(jabber_buddy_by_jid(ic, "wilmer@gaast.net", GET_BUDDY_EXACT) != NULL); fail_unless(jabber_buddy_by_jid(ic, "WILMER@gaast.net", 0) == budw3); /* Check O_FIRST and see if it's indeed the first item from the list. */ @@ -82,7 +82,7 @@ static void check_buddy_add(int l) fail_if(jabber_buddy_remove(ic, "nekkid@lamejab.net/Illegal")); fail_unless(jabber_buddy_remove(ic, "nekkid@lamejab.net")); - fail_if(jabber_buddy_by_jid(ic, "nekkid@lamejab.net", 0)); + fail_if(jabber_buddy_by_jid(ic, "nekkid@lamejab.net", 0) != NULL); /* Fixing a bug in this branch that caused information to get lost when removing the first full JID from a list. */ |