Added individual options to send and request delivery receipts

This commit is contained in:
James Booth
2015-03-19 22:57:51 +00:00
parent 8e80a8ccf7
commit f1f047889e
8 changed files with 73 additions and 21 deletions

View File

@@ -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;

View File

@@ -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

View File

@@ -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);