From a1c92ddfe4e8fbd01b13937f7d771cccc67ddeb5 Mon Sep 17 00:00:00 2001 From: Troy Sankey Date: Wed, 4 Oct 2017 13:28:55 -0400 Subject: Add quotations around and in the otr docs The user doesn't otherwise know how to type answers or secrets containing spaces. --- otr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/otr.c b/otr.c index 2a2385ce..ec1c1a3c 100644 --- a/otr.c +++ b/otr.c @@ -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 \x02", + " - respond with \x02otr smp %s \"\"\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 \x02", + irc_rootmsg(irc, "smp: respond with \x02otr smp %s \"\"\x02", u->nick); break; case OTRL_SMPEVENT_CHEATED: -- cgit v1.2.3 From 671b1efd6e58761f2167b9d5ee6d1f9e6496a146 Mon Sep 17 00:00:00 2001 From: dequis Date: Thu, 5 Oct 2017 00:00:54 -0300 Subject: tests: fix build warnings in jabber_buddy_by_jid tests --- tests/check_jabber_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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. */ -- cgit v1.2.3 From 861de54f5a71fc7a1b27434e1618e79617b6e072 Mon Sep 17 00:00:00 2001 From: dequis Date: Thu, 5 Oct 2017 00:01:30 -0300 Subject: travis: require ubuntu precise explicitly, install more deps --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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" -- cgit v1.2.3