From fca59a3110046bc145e5b44dd6b63840c48b5083 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 28 Aug 2016 17:27:26 +0100 Subject: [PATCH 01/10] log_info on private carbons --- src/xmpp/message.c | 5 +++++ tests/functionaltests/functionaltests.c | 1 + tests/functionaltests/test_carbons.c | 30 +++++++++++++++++++++++++ tests/functionaltests/test_carbons.h | 1 + 4 files changed, 37 insertions(+) diff --git a/src/xmpp/message.c b/src/xmpp/message.c index 5ccabdf4..9d80fb1f 100644 --- a/src/xmpp/message.c +++ b/src/xmpp/message.c @@ -686,6 +686,11 @@ _handle_carbons(xmpp_stanza_t *const stanza) return TRUE; } + if (g_strcmp0(name, "private") == 0) { + log_info("Carbon received with private element."); + return FALSE; + } + if ((g_strcmp0(name, "received") != 0) && (g_strcmp0(name, "sent") != 0)) { log_warning("Carbon received with unrecognised stanza name: %s", name); return TRUE; diff --git a/tests/functionaltests/functionaltests.c b/tests/functionaltests/functionaltests.c index d6989377..617ab838 100644 --- a/tests/functionaltests/functionaltests.c +++ b/tests/functionaltests/functionaltests.c @@ -71,6 +71,7 @@ int main(int argc, char* argv[]) { PROF_FUNC_TEST(send_disable_carbons), PROF_FUNC_TEST(receive_carbon), PROF_FUNC_TEST(receive_self_carbon), + PROF_FUNC_TEST(receive_private_carbon), PROF_FUNC_TEST(send_receipt_request), PROF_FUNC_TEST(send_receipt_on_request), diff --git a/tests/functionaltests/test_carbons.c b/tests/functionaltests/test_carbons.c index 94bd57a0..414284ff 100644 --- a/tests/functionaltests/test_carbons.c +++ b/tests/functionaltests/test_carbons.c @@ -118,3 +118,33 @@ receive_self_carbon(void **state) assert_true(prof_output_regex("me: .+self sent carbon")); } + +void +receive_private_carbon(void **state) +{ + prof_input("/carbons on"); + + prof_connect(); + assert_true(stbbr_received( + "" + )); + + stbbr_send( + "" + "10" + "On my mobile" + "" + ); + assert_true(prof_output_exact("Buddy1 (mobile) is online, \"On my mobile\"")); + prof_input("/msg Buddy1"); + assert_true(prof_output_exact("unencrypted")); + + stbbr_send( + "" + "Private carbon" + "" + "" + ); + + assert_true(prof_output_regex("Buddy1/mobile: .+Private carbon")); +} diff --git a/tests/functionaltests/test_carbons.h b/tests/functionaltests/test_carbons.h index 6d24c8ae..ab48a009 100644 --- a/tests/functionaltests/test_carbons.h +++ b/tests/functionaltests/test_carbons.h @@ -3,4 +3,5 @@ void connect_with_carbons_enabled(void **state); void send_disable_carbons(void **state); void receive_carbon(void **state); void receive_self_carbon(void **state); +void receive_private_carbon(void **state); From 6a18dedca8947ea9faa25940ce990268f2661c0a Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 28 Aug 2016 17:30:15 +0100 Subject: [PATCH 02/10] Fixed typos --- src/xmpp/iq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c index 260c062e..f5e1657c 100644 --- a/src/xmpp/iq.c +++ b/src/xmpp/iq.c @@ -264,8 +264,8 @@ iq_autoping_check(void) unsigned long seconds_elapsed = elapsed * 1.0; gint timeout = prefs_get_autoping_timeout(); if (timeout > 0 && seconds_elapsed >= timeout) { - cons_show("Autoping response timed out afer %u seconds.", timeout); - log_debug("Autoping check: timed out afer %u seconds, disconnecting", timeout); + cons_show("Autoping response timed out after %u seconds.", timeout); + log_debug("Autoping check: timed out after %u seconds, disconnecting", timeout); session_autoping_fail(); autoping_wait = FALSE; g_timer_destroy(autoping_time); From ea98a8b04a0577bd6aacc81f9c98b2b7c4d5cc68 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 28 Aug 2016 22:12:50 +0100 Subject: [PATCH 03/10] Rename Bookmark->jid to Bookmark->barejid --- src/ui/console.c | 8 +++--- src/xmpp/bookmark.c | 38 ++++++++++++++--------------- src/xmpp/xmpp.h | 2 +- tests/unittests/test_cmd_bookmark.c | 14 +++++------ 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/ui/console.c b/src/ui/console.c index 3c104f4d..80f854c3 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -698,10 +698,10 @@ cons_show_bookmarks(const GList *list) theme_item_t presence_colour = THEME_TEXT; - if (muc_active(item->jid)) { + if (muc_active(item->barejid)) { presence_colour = THEME_ONLINE; } - win_vprint(console, '-', 0, NULL, NO_EOL, presence_colour, "", " %s", item->jid); + win_vprint(console, '-', 0, NULL, NO_EOL, presence_colour, "", " %s", item->barejid); if (item->nick) { win_vprint(console, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", "/%s", item->nick); } @@ -711,8 +711,8 @@ cons_show_bookmarks(const GList *list) if (item->password) { win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", " (private)"); } - if (muc_active(item->jid)) { - ProfWin *roomwin = (ProfWin*)wins_get_muc(item->jid); + if (muc_active(item->barejid)) { + ProfWin *roomwin = (ProfWin*)wins_get_muc(item->barejid); if (roomwin) { int num = wins_get_num(roomwin); win_vprint(console, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", " (win %d)", num); diff --git a/src/xmpp/bookmark.c b/src/xmpp/bookmark.c index 8b9b6758..88b452f2 100644 --- a/src/xmpp/bookmark.c +++ b/src/xmpp/bookmark.c @@ -103,7 +103,7 @@ bookmark_add(const char *jid, const char *nick, const char *password, const char } Bookmark *bookmark = malloc(sizeof(Bookmark)); - bookmark->jid = strdup(jid); + bookmark->barejid = strdup(jid); if (nick) { bookmark->nick = strdup(nick); } else { @@ -171,16 +171,16 @@ bookmark_join(const char *jid) char *account_name = session_get_account_name(); ProfAccount *account = accounts_get_account(account_name); - if (!muc_active(bookmark->jid)) { + if (!muc_active(bookmark->barejid)) { char *nick = bookmark->nick; if (!nick) { nick = account->muc_nick; } - presence_join_room(bookmark->jid, nick, bookmark->password); - muc_join(bookmark->jid, nick, bookmark->password, FALSE); + presence_join_room(bookmark->barejid, nick, bookmark->password); + muc_join(bookmark->barejid, nick, bookmark->password, FALSE); account_free(account); - } else if (muc_roster_complete(bookmark->jid)) { - ui_room_join(bookmark->jid, TRUE); + } else if (muc_roster_complete(bookmark->barejid)) { + ui_room_join(bookmark->barejid, TRUE); account_free(account); } @@ -259,13 +259,13 @@ _bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) child = xmpp_stanza_get_next(child); continue; } - const char *jid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID); - if (!jid) { + const char *barejid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID); + if (!barejid) { child = xmpp_stanza_get_next(child); continue; } - log_debug("Handle bookmark for %s", jid); + log_debug("Handle bookmark for %s", barejid); char *nick = NULL; xmpp_stanza_t *nick_st = xmpp_stanza_get_child_by_name(child, "nick"); @@ -285,13 +285,13 @@ _bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) autojoin_val = TRUE; } - autocomplete_add(bookmark_ac, jid); + autocomplete_add(bookmark_ac, barejid); Bookmark *bookmark = malloc(sizeof(Bookmark)); - bookmark->jid = strdup(jid); + bookmark->barejid = strdup(barejid); bookmark->nick = nick; bookmark->password = password; bookmark->autojoin = autojoin_val; - g_hash_table_insert(bookmarks, strdup(jid), bookmark); + g_hash_table_insert(bookmarks, strdup(barejid), bookmark); if (autojoin_val) { Jid *room_jid; @@ -302,11 +302,11 @@ _bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) nick = account->muc_nick; } - log_debug("Autojoin %s with nick=%s", jid, nick); - room_jid = jid_create_from_bare_and_resource(jid, nick); + log_debug("Autojoin %s with nick=%s", barejid, nick); + room_jid = jid_create_from_bare_and_resource(barejid, nick); if (!muc_active(room_jid->barejid)) { - presence_join_room(jid, nick, password); - muc_join(jid, nick, password, TRUE); + presence_join_room(barejid, nick, password); + muc_join(barejid, nick, password, TRUE); } jid_destroy(room_jid); account_free(account); @@ -325,7 +325,7 @@ _bookmark_destroy(Bookmark *bookmark) return; } - free(bookmark->jid); + free(bookmark->barejid); free(bookmark->nick); free(bookmark->password); free(bookmark); @@ -354,9 +354,9 @@ _send_bookmarks(void) Bookmark *bookmark = curr->data; xmpp_stanza_t *conference = xmpp_stanza_new(ctx); xmpp_stanza_set_name(conference, STANZA_NAME_CONFERENCE); - xmpp_stanza_set_attribute(conference, STANZA_ATTR_JID, bookmark->jid); + xmpp_stanza_set_attribute(conference, STANZA_ATTR_JID, bookmark->barejid); - Jid *jidp = jid_create(bookmark->jid); + Jid *jidp = jid_create(bookmark->barejid); if (jidp->localpart) { xmpp_stanza_set_attribute(conference, STANZA_ATTR_NAME, jidp->localpart); } diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index 6157b648..8dfe7c0e 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -78,7 +78,7 @@ typedef enum { } jabber_invite_t; typedef struct bookmark_t { - char *jid; + char *barejid; char *nick; char *password; gboolean autojoin; diff --git a/tests/unittests/test_cmd_bookmark.c b/tests/unittests/test_cmd_bookmark.c index 759b8238..e321f0db 100644 --- a/tests/unittests/test_cmd_bookmark.c +++ b/tests/unittests/test_cmd_bookmark.c @@ -62,7 +62,7 @@ void cmd_bookmark_shows_usage_when_no_args(void **state) static void _free_bookmark(Bookmark *bookmark) { - free(bookmark->jid); + free(bookmark->barejid); free(bookmark->nick); free(bookmark); } @@ -70,7 +70,7 @@ static void _free_bookmark(Bookmark *bookmark) static gboolean _cmp_bookmark(Bookmark *bm1, Bookmark *bm2) { - if (strcmp(bm1->jid, bm2->jid) != 0) { + if (strcmp(bm1->barejid, bm2->barejid) != 0) { return FALSE; } if (strcmp(bm1->nick, bm2->nick) != 0) { @@ -91,23 +91,23 @@ void cmd_bookmark_list_shows_bookmarks(void **state) window.type = WIN_CONSOLE; Bookmark *bm1 = malloc(sizeof(Bookmark)); - bm1->jid = strdup("room1@conf.org"); + bm1->barejid = strdup("room1@conf.org"); bm1->nick = strdup("bob"); bm1->autojoin = FALSE; Bookmark *bm2 = malloc(sizeof(Bookmark)); - bm2->jid = strdup("room2@conf.org"); + bm2->barejid = strdup("room2@conf.org"); bm2->nick = strdup("steve"); bm2->autojoin = TRUE; Bookmark *bm3 = malloc(sizeof(Bookmark)); - bm3->jid = strdup("room3@conf.org"); + bm3->barejid = strdup("room3@conf.org"); bm3->nick = strdup("dave"); bm3->autojoin = TRUE; Bookmark *bm4 = malloc(sizeof(Bookmark)); - bm4->jid = strdup("room4@conf.org"); + bm4->barejid = strdup("room4@conf.org"); bm4->nick = strdup("james"); bm4->autojoin = FALSE; Bookmark *bm5 = malloc(sizeof(Bookmark)); - bm5->jid = strdup("room5@conf.org"); + bm5->barejid = strdup("room5@conf.org"); bm5->nick = strdup("mike"); bm5->autojoin = FALSE; From 47a1a62009d411002d4e3b1d6eefd55ba2fe1011 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 28 Aug 2016 22:42:09 +0100 Subject: [PATCH 04/10] Add sv_ev_bookmark_autojoin --- src/event/server_events.c | 22 ++++++++++++++++++++++ src/event/server_events.h | 1 + src/xmpp/bookmark.c | 17 +---------------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/event/server_events.c b/src/event/server_events.c index 1b935c6a..d271ec55 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -1079,3 +1079,25 @@ sv_ev_lastactivity_response(const char *const from, const int seconds, const cha g_free(date_fmt); jid_destroy(jidp); } + +void +sv_ev_bookmark_autojoin(Bookmark *bookmark) +{ + char *nick = NULL; + if (bookmark->nick) { + nick = strdup(bookmark->nick); + } else { + char *account_name = session_get_account_name(); + ProfAccount *account = accounts_get_account(account_name); + nick = strdup(account->muc_nick); + account_free(account); + } + + log_debug("Autojoin %s with nick=%s", bookmark->barejid, nick); + if (!muc_active(bookmark->barejid)) { + presence_join_room(bookmark->barejid, nick, bookmark->password); + muc_join(bookmark->barejid, nick, bookmark->password, TRUE); + } + + free(nick); +} diff --git a/src/event/server_events.h b/src/event/server_events.h index 7f60c3a5..cc67952f 100644 --- a/src/event/server_events.h +++ b/src/event/server_events.h @@ -87,5 +87,6 @@ void sv_ev_roster_update(const char *const barejid, const char *const name, void sv_ev_roster_received(void); int sv_ev_certfail(const char *const errormsg, TLSCertificate *cert); void sv_ev_lastactivity_response(const char *const from, const int seconds, const char *const msg); +void sv_ev_bookmark_autojoin(Bookmark *bookmark); #endif diff --git a/src/xmpp/bookmark.c b/src/xmpp/bookmark.c index 88b452f2..d4371dc5 100644 --- a/src/xmpp/bookmark.c +++ b/src/xmpp/bookmark.c @@ -294,22 +294,7 @@ _bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) g_hash_table_insert(bookmarks, strdup(barejid), bookmark); if (autojoin_val) { - Jid *room_jid; - - char *account_name = session_get_account_name(); - ProfAccount *account = accounts_get_account(account_name); - if (nick == NULL) { - nick = account->muc_nick; - } - - log_debug("Autojoin %s with nick=%s", barejid, nick); - room_jid = jid_create_from_bare_and_resource(barejid, nick); - if (!muc_active(room_jid->barejid)) { - presence_join_room(barejid, nick, password); - muc_join(barejid, nick, password, TRUE); - } - jid_destroy(room_jid); - account_free(account); + sv_ev_bookmark_autojoin(bookmark); } child = xmpp_stanza_get_next(child); From 5be8f5f5604627253e287797475847579b0e12b7 Mon Sep 17 00:00:00 2001 From: Dmitry Podgorny Date: Fri, 2 Sep 2016 20:53:41 +0300 Subject: [PATCH 05/10] Fix implicit declaration of function free --- src/ui/tray.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ui/tray.c b/src/ui/tray.c index ec1f1f96..6aca8ea5 100644 --- a/src/ui/tray.c +++ b/src/ui/tray.c @@ -38,6 +38,7 @@ #include #include #include +#include #include "log.h" #include "config/preferences.h" From 6090f76f729cd9111f8b9bcca62ea4b1a43cbb8e Mon Sep 17 00:00:00 2001 From: Dmitry Podgorny Date: Fri, 2 Sep 2016 20:56:20 +0300 Subject: [PATCH 06/10] Add missed argument --- src/event/client_events.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/event/client_events.c b/src/event/client_events.c index c8111970..31ddcad9 100644 --- a/src/event/client_events.c +++ b/src/event/client_events.c @@ -159,9 +159,9 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char *const msg, const char *const oo #ifndef HAVE_LIBGPGME gboolean handled = otr_on_message_send(chatwin, plugin_msg); if (!handled) { - char *id = message_send_chat(chatwin->barejid, plugin_msg, oob_url); + char *id = message_send_chat(chatwin->barejid, plugin_msg, oob_url, request_receipt); chat_log_msg_out(chatwin->barejid, plugin_msg); - chatwin_outgoing_msg(chatwin, plugin_msg, id, PROF_MSG_PLAIN); + chatwin_outgoing_msg(chatwin, plugin_msg, id, PROF_MSG_PLAIN, request_receipt); free(id); } @@ -177,12 +177,12 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char *const msg, const char *const oo if (chatwin->pgp_send) { char *id = message_send_chat_pgp(chatwin->barejid, plugin_msg); chat_log_pgp_msg_out(chatwin->barejid, plugin_msg); - chatwin_outgoing_msg(chatwin, plugin_msg, id, PROF_MSG_PGP); + chatwin_outgoing_msg(chatwin, plugin_msg, id, PROF_MSG_PGP, request_receipt); free(id); } else { - char *id = message_send_chat(chatwin->barejid, plugin_msg, oob_url); + char *id = message_send_chat(chatwin->barejid, plugin_msg, oob_url, request_receipt); chat_log_msg_out(chatwin->barejid, plugin_msg); - chatwin_outgoing_msg(chatwin, plugin_msg, id, PROF_MSG_PLAIN); + chatwin_outgoing_msg(chatwin, plugin_msg, id, PROF_MSG_PLAIN, request_receipt); free(id); } @@ -195,9 +195,9 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char *const msg, const char *const oo // OTR unsupported, PGP unsupported #ifndef HAVE_LIBOTR #ifndef HAVE_LIBGPGME - char *id = message_send_chat(chatwin->barejid, plugin_msg, oob_url); + char *id = message_send_chat(chatwin->barejid, plugin_msg, oob_url, request_receipt); chat_log_msg_out(chatwin->barejid, plugin_msg); - chatwin_outgoing_msg(chatwin, plugin_msg, id, PROF_MSG_PLAIN); + chatwin_outgoing_msg(chatwin, plugin_msg, id, PROF_MSG_PLAIN, request_receipt); free(id); plugins_post_chat_message_send(chatwin->barejid, plugin_msg); From 22e53c9fdcd90a447f8dd8bad72ddbdb27adab11 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sat, 3 Sep 2016 22:25:26 +0100 Subject: [PATCH 07/10] Add travis build script --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f01c19d6..5c7435fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,5 +32,4 @@ install: - sudo make install - cd .. - rm -rf stabber - - ./bootstrap.sh -script: ./configure --enable-python-plugins --enable-c-plugins && make && make check +script: ./travis-build.sh From b5b73ab8ff503a5ae6f253b27012235850cd73ed Mon Sep 17 00:00:00 2001 From: James Booth Date: Sat, 3 Sep 2016 22:26:14 +0100 Subject: [PATCH 08/10] Add travis build script --- travis-build.sh | 132 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100755 travis-build.sh diff --git a/travis-build.sh b/travis-build.sh new file mode 100755 index 00000000..6e9f0b0a --- /dev/null +++ b/travis-build.sh @@ -0,0 +1,132 @@ +#!/bin/bash + +error_handler() +{ + ERR_CODE=$? + echo + echo "Error $ERR_CODE with command '$BASH_COMMAND' on line ${BASH_LINENO[0]}. Exiting." + echo + exit $ERR_CODE +} + +trap error_handler ERR + +./bootstrap.sh + +echo +echo "--> Building with ./configure --enable-notifications --enable-icons --enable-otr --enable-pgp --enable-plugins --enable-c-plugins --enable-python-plugins --with-xscreensaver" +echo +./configure --enable-notifications --enable-icons --enable-otr --enable-pgp --enable-plugins --enable-c-plugins --enable-python-plugins --with-xscreensaver +make +make check-unit +./profanity -v +make clean + +echo +echo "--> Building with ./configure --disable-notifications --disable-icons --disable-otr --disable-pgp --disable-plugins --disable-c-plugins --disable-python-plugins --without-xscreensaver" +echo +./configure --disable-notifications --disable-icons --disable-otr --disable-pgp --disable-plugins --disable-c-plugins --disable-python-plugins --without-xscreensaver +make +make check-unit +./profanity -v +make clean + +echo +echo "--> Building with ./configure --disable-notifications" +echo +./configure --disable-notifications +make +make check-unit +./profanity -v +make clean + +echo +echo "--> Building with ./configure --disable-icons" +echo +./configure --disable-icons +make +make check-unit +./profanity -v +make clean + +echo +echo "--> Building with ./configure --disable-otr" +echo +./configure --disable-otr +make +make check-unit +./profanity -v +make clean + +echo +echo "--> Building with ./configure --disable-pgp" +echo +./configure --disable-pgp +make +make check-unit +./profanity -v +make clean + +echo +echo "--> Building with ./configure --disable-pgp --disable-otr" +echo +./configure --disable-pgp --disable-otr +make +make check-unit +./profanity -v +make clean + +echo +echo "--> Building with ./configure --disable-plugins" +echo +./configure --disable-plugins +make +make check-unit +./profanity -v +make clean + +echo +echo "--> Building with ./configure --disable-python-plugins" +echo +./configure --disable-python-plugins +make +make check-unit +./profanity -v +make clean + +echo +echo "--> Building with ./configure --disable-c-plugins" +echo +./configure --disable-c-plugins +make +make check-unit +./profanity -v +make clean + +echo +echo "--> Building with ./configure --disable-c-plugins --disable-python-plugins" +echo +./configure --disable-c-plugins --disable-python-plugins +make +make check-unit +./profanity -v +make clean + +echo +echo "--> Building with ./configure --without-xscreensaver" +echo +./configure --without-xscreensaver +make +make check-unit +./profanity -v +make clean + +echo +echo "--> Building with ./configure" +echo +./configure +make +make check +./profanity -v +make clean + From f6e9ff5b9bdedf510c1652495c6760ecf952c57e Mon Sep 17 00:00:00 2001 From: James Booth Date: Sat, 3 Sep 2016 22:53:32 +0100 Subject: [PATCH 09/10] Fix missing params --- src/event/client_events.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/event/client_events.c b/src/event/client_events.c index 31ddcad9..0f85a61a 100644 --- a/src/event/client_events.c +++ b/src/event/client_events.c @@ -157,7 +157,7 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char *const msg, const char *const oo // OTR supported, PGP unsupported #ifdef HAVE_LIBOTR #ifndef HAVE_LIBGPGME - gboolean handled = otr_on_message_send(chatwin, plugin_msg); + gboolean handled = otr_on_message_send(chatwin, plugin_msg, request_receipt); if (!handled) { char *id = message_send_chat(chatwin->barejid, plugin_msg, oob_url, request_receipt); chat_log_msg_out(chatwin->barejid, plugin_msg); @@ -175,7 +175,7 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char *const msg, const char *const oo #ifndef HAVE_LIBOTR #ifdef HAVE_LIBGPGME if (chatwin->pgp_send) { - char *id = message_send_chat_pgp(chatwin->barejid, plugin_msg); + char *id = message_send_chat_pgp(chatwin->barejid, plugin_msg, request_receipt); chat_log_pgp_msg_out(chatwin->barejid, plugin_msg); chatwin_outgoing_msg(chatwin, plugin_msg, id, PROF_MSG_PGP, request_receipt); free(id); From bd51ab83d6ea69337d6043a858448d4920b0ae99 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sat, 3 Sep 2016 23:07:16 +0100 Subject: [PATCH 10/10] Travis build: Run unit tests once --- travis-build.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/travis-build.sh b/travis-build.sh index 6e9f0b0a..984d3afe 100755 --- a/travis-build.sh +++ b/travis-build.sh @@ -18,7 +18,6 @@ echo "--> Building with ./configure --enable-notifications --enable-icons --enab echo ./configure --enable-notifications --enable-icons --enable-otr --enable-pgp --enable-plugins --enable-c-plugins --enable-python-plugins --with-xscreensaver make -make check-unit ./profanity -v make clean @@ -27,7 +26,6 @@ echo "--> Building with ./configure --disable-notifications --disable-icons --di echo ./configure --disable-notifications --disable-icons --disable-otr --disable-pgp --disable-plugins --disable-c-plugins --disable-python-plugins --without-xscreensaver make -make check-unit ./profanity -v make clean @@ -36,7 +34,6 @@ echo "--> Building with ./configure --disable-notifications" echo ./configure --disable-notifications make -make check-unit ./profanity -v make clean @@ -45,7 +42,6 @@ echo "--> Building with ./configure --disable-icons" echo ./configure --disable-icons make -make check-unit ./profanity -v make clean @@ -54,7 +50,6 @@ echo "--> Building with ./configure --disable-otr" echo ./configure --disable-otr make -make check-unit ./profanity -v make clean @@ -63,7 +58,6 @@ echo "--> Building with ./configure --disable-pgp" echo ./configure --disable-pgp make -make check-unit ./profanity -v make clean @@ -72,7 +66,6 @@ echo "--> Building with ./configure --disable-pgp --disable-otr" echo ./configure --disable-pgp --disable-otr make -make check-unit ./profanity -v make clean @@ -81,7 +74,6 @@ echo "--> Building with ./configure --disable-plugins" echo ./configure --disable-plugins make -make check-unit ./profanity -v make clean @@ -90,7 +82,6 @@ echo "--> Building with ./configure --disable-python-plugins" echo ./configure --disable-python-plugins make -make check-unit ./profanity -v make clean @@ -99,7 +90,6 @@ echo "--> Building with ./configure --disable-c-plugins" echo ./configure --disable-c-plugins make -make check-unit ./profanity -v make clean @@ -108,7 +98,6 @@ echo "--> Building with ./configure --disable-c-plugins --disable-python-plugins echo ./configure --disable-c-plugins --disable-python-plugins make -make check-unit ./profanity -v make clean @@ -117,7 +106,6 @@ echo "--> Building with ./configure --without-xscreensaver" echo ./configure --without-xscreensaver make -make check-unit ./profanity -v make clean