mirror of
https://github.com/profanity-im/profanity.git
synced 2024-11-03 19:37:16 -05:00
Merge branch 'master' into plugins
This commit is contained in:
commit
cf5b465dac
@ -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
|
||||
<https://github.com/boothj5/profanity>
|
||||
.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>
|
||||
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 <pasis.ua@gmail.com>
|
||||
.br
|
||||
Dolan O'Toole
|
||||
.br
|
||||
Kieran Thandi
|
||||
.br
|
||||
Sam Whited
|
||||
.br
|
||||
Florent Peterschmitt
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user