From a64b293878ed47c8632fd0b7928fdcb070ddea96 Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 22 Jul 2013 20:35:43 +0100 Subject: [PATCH 1/2] Removed escaping XML as handled by libstrophe https://github.com/metajack/libstrophe/commit/4ad21c9283ceae9109ea71860aa27814222c9ee3 --- src/xmpp/stanza.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c index d2de44f0..2e2f9858 100644 --- a/src/xmpp/stanza.c +++ b/src/xmpp/stanza.c @@ -58,8 +58,6 @@ stanza_create_message(xmpp_ctx_t *ctx, const char * const recipient, const char * const type, const char * const message, const char * const state, const char * const id) { - char *encoded_xml = encode_xml(message); - xmpp_stanza_t *msg, *body, *text; msg = xmpp_stanza_new(ctx); @@ -74,7 +72,7 @@ stanza_create_message(xmpp_ctx_t *ctx, const char * const recipient, xmpp_stanza_set_name(body, STANZA_NAME_BODY); text = xmpp_stanza_new(ctx); - xmpp_stanza_set_text(text, encoded_xml); + xmpp_stanza_set_text(text, message); xmpp_stanza_add_child(body, text); xmpp_stanza_release(text); xmpp_stanza_add_child(msg, body); @@ -88,8 +86,6 @@ stanza_create_message(xmpp_ctx_t *ctx, const char * const recipient, xmpp_stanza_release(chat_state); } - g_free(encoded_xml); - return msg; } From a29a21ed93e9791a91e09505990fadd142f81410 Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 22 Jul 2013 22:09:16 +0100 Subject: [PATCH 2/2] Updated man page --- docs/profanity.1 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/profanity.1 b/docs/profanity.1 index 915f85bb..629312e3 100644 --- a/docs/profanity.1 +++ b/docs/profanity.1 @@ -1,4 +1,4 @@ -.TH Profanity 1 "August 2012" "Profanity XMPP client" +.TH Profanity 1 "July 2013" "Profanity XMPP client" .SH NAME Profanity \- a simple console based XMPP chat client. .SH SYNOPSIS @@ -59,7 +59,7 @@ or with a Github account by logging issues on the issue tracker at: .PP .SH LICENSE -Copyright (C) 2012 James Booth . +Copyright (C) 2012, 2013 James Booth . License GPLv3+: GNU GPL version 3 or later This is free software; you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. @@ -77,3 +77,9 @@ Colin Bradley Dmitry Podgorny .br Dolan O'Toole +.br +Kieran Thandi +.br +Sam Whited +.br +Florent Peterschmitt