diff options
| author | James Booth <boothj5@gmail.com> | 2015-03-19 22:57:51 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-03-19 22:57:51 +0000 |
| commit | f1f047889eed360a0c91be4fcabd24199089c02a (patch) | |
| tree | d1662f2e3f3c086eccf1f33611f32442d598f0a6 /src/ui | |
| parent | 8e80a8ccf7578de71c02149e2bb99fd36b711915 (diff) | |
| download | profani-tty-f1f047889eed360a0c91be4fcabd24199089c02a.tar.gz | |
Added individual options to send and request delivery receipts
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/buffer.c | 2 | ||||
| -rw-r--r-- | src/ui/console.c | 12 | ||||
| -rw-r--r-- | src/ui/core.c | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/ui/buffer.c b/src/ui/buffer.c index 40a994f1..0848b60f 100644 --- a/src/ui/buffer.c +++ b/src/ui/buffer.c @@ -106,7 +106,7 @@ buffer_mark_received(ProfBuff buffer, const char * const id) GSList *entries = buffer->entries; while (entries) { ProfBuffEntry *entry = entries->data; - if (entry->receipt) { + if (entry->receipt && g_strcmp0(entry->receipt->id, id) == 0) { if (!entry->receipt->received) { entry->receipt->received = TRUE; return TRUE; diff --git a/src/ui/console.c b/src/ui/console.c index cd74f455..328f59aa 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -1199,10 +1199,16 @@ cons_carbons_setting(void) void cons_receipts_setting(void) { - if (prefs_get_boolean(PREF_RECEIPTS)) - cons_show("Message receipts (/receipts) : ON"); + if (prefs_get_boolean(PREF_RECEIPTS_REQUEST)) + cons_show("Request receipts (/receipts) : ON"); else - cons_show("Message receipts (/receipts) : OFF"); + cons_show("Request receipts (/receipts) : OFF"); + + if (prefs_get_boolean(PREF_RECEIPTS_SEND)) + cons_show("Send receipts (/receipts) : ON"); + else + cons_show("Send receipts (/receipts) : OFF"); + } void diff --git a/src/ui/core.c b/src/ui/core.c index c00c7838..acb9e550 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -1467,7 +1467,7 @@ ui_outgoing_chat_msg(const char * const barejid, const char * const message, cha ProfChatWin *chatwin = (ProfChatWin*)window; chat_state_active(chatwin->state); - if (prefs_get_boolean(PREF_RECEIPTS) && id) { + if (prefs_get_boolean(PREF_RECEIPTS_REQUEST) && id) { win_print_with_receipt(window, '-', NULL, 0, THEME_TEXT_ME, "me", message, id); } else { win_print(window, '-', NULL, 0, THEME_TEXT_ME, "me", message); |