1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge branch 'master' into osx-functional

This commit is contained in:
James Booth 2015-08-09 23:10:14 +01:00
commit db7b26b018
2 changed files with 3 additions and 1 deletions

View File

@ -940,6 +940,7 @@ win_print_with_receipt(ProfWin *window, const char show_char, int pad_indent, GT
_win_print(window, show_char, pad_indent, time, flags, theme_item, from, message, receipt);
// TODO: cross-reference.. this should be replaced by a real event-based system
ui_input_nonblocking(TRUE);
g_date_time_unref(time);
}
void

View File

@ -581,9 +581,10 @@ _message_send_receipt(const char * const fulljid, const char * const message_id)
xmpp_conn_t * const conn = connection_get_conn();
xmpp_ctx_t * const ctx = connection_get_ctx();
xmpp_stanza_t *message = xmpp_stanza_new(ctx);
char *id = create_unique_id("receipt");
xmpp_stanza_set_name(message, STANZA_NAME_MESSAGE);
char *id = create_unique_id("receipt");
xmpp_stanza_set_id(message, id);
free(id);
xmpp_stanza_set_attribute(message, STANZA_ATTR_TO, fulljid);
xmpp_stanza_t *receipt = xmpp_stanza_new(ctx);