From 8ce299838dad3fe31e39d8254ae4ba80c8bd76a5 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 3 Jul 2020 16:37:22 +0200 Subject: message.c: Remove from/to setting out of condition Since its done in both cases. --- src/xmpp/message.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/xmpp/message.c b/src/xmpp/message.c index e81f7ca7..a7c79243 100644 --- a/src/xmpp/message.c +++ b/src/xmpp/message.c @@ -1264,18 +1264,15 @@ _handle_carbons(xmpp_stanza_t *const stanza) } //TODO: maybe also add is_carbon maybe even an enum with outgoing/incoming - //could be that then we can have sv_ev_carbon no incoming/outgoing if (message->plain || message->encrypted || message->body) { + message->from_jid = jid_from; + message->to_jid = jid_to; + // if we are the recipient, treat as standard incoming message if (g_strcmp0(mybarejid, jid_to->barejid) == 0) { - message->from_jid = jid_from; - message->to_jid = jid_to; sv_ev_incoming_carbon(message); - // else treat as a sent message } else { - message->from_jid = jid_from; - message->to_jid = jid_to; sv_ev_outgoing_carbon(message); } } -- cgit 1.4.1-2-gfad0