aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Merge branch 'master' into nextdev

Browse Source
This commit is contained in:
James Booth 2013-07-22 22:09:51 +01:00
commit 66238641e0
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/profanity.1
View File

@ -1,4 +1,4 @@
.TH Profanity 1 "August 2012" "Profanity XMPP client" .TH Profanity 1 "July 2013" "Profanity XMPP client"
.SH NAME .SH NAME
Profanity \- a simple console based XMPP chat client. Profanity \- a simple console based XMPP chat client.
.SH SYNOPSIS .SH SYNOPSIS
@ -59,7 +59,7 @@ or with a Github account by logging issues on the issue tracker at:
.PP .PP
<https://github.com/boothj5/profanity> <https://github.com/boothj5/profanity>
.SH LICENSE .SH LICENSE
Copyright (C) 2012 James Booth <boothj5web@gmail.com>. Copyright (C) 2012, 2013 James Booth <boothj5web@gmail.com>.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software; you are free to change and redistribute it. This is free software; you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law. There is NO WARRANTY, to the extent permitted by law.
@ -77,3 +77,9 @@ Colin Bradley
Dmitry Podgorny <pasis.ua@gmail.com> Dmitry Podgorny <pasis.ua@gmail.com>
.br .br
Dolan O'Toole Dolan O'Toole
.br
Kieran Thandi
.br
Sam Whited
.br
Florent Peterschmitt

6
src/xmpp/stanza.c
View File

@ -115,8 +115,6 @@ stanza_create_message(xmpp_ctx_t *ctx, const char * const recipient,
const char * const type, const char * const message, const char * const type, const char * const message,
const char * const state, const char * const id) const char * const state, const char * const id)
{ {
char *encoded_xml = encode_xml(message);
xmpp_stanza_t *msg, *body, *text; xmpp_stanza_t *msg, *body, *text;
msg = xmpp_stanza_new(ctx); msg = xmpp_stanza_new(ctx);
@ -131,7 +129,7 @@ stanza_create_message(xmpp_ctx_t *ctx, const char * const recipient,
xmpp_stanza_set_name(body, STANZA_NAME_BODY); xmpp_stanza_set_name(body, STANZA_NAME_BODY);
text = xmpp_stanza_new(ctx); 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_add_child(body, text);
xmpp_stanza_release(text); xmpp_stanza_release(text);
xmpp_stanza_add_child(msg, body); xmpp_stanza_add_child(msg, body);
@ -145,8 +143,6 @@ stanza_create_message(xmpp_ctx_t *ctx, const char * const recipient,
xmpp_stanza_release(chat_state); xmpp_stanza_release(chat_state);
} }
g_free(encoded_xml);
return msg; return msg;
} }