diff options
| author | dequis <dx@dxzone.com.ar> | 2016-01-21 03:15:44 -0300 |
|---|---|---|
| committer | dequis <dx@dxzone.com.ar> | 2016-01-21 03:15:44 -0300 |
| commit | 7e68015a3f67d417b07e395280035aaa74c6a2c8 (patch) | |
| tree | 24bd0eb75fec21206045dbc86e010613d875aed4 /protocols/jabber/message.c | |
| parent | 82cb190c9932c641e790286cbe03c2f691889a57 (diff) | |
Revert "hipchat: Implement their own variant of self-messages [...]"
This reverts commit d11ccbf6ea94264bde8b0f525c4bbedf50de0174.
After thinking about this long enough I've decided this is a bad idea,
and better wait for the hipchat server to support carbons.
Diffstat (limited to 'protocols/jabber/message.c')
| -rw-r--r-- | protocols/jabber/message.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/protocols/jabber/message.c b/protocols/jabber/message.c index 5a271fa8..c57e6337 100644 --- a/protocols/jabber/message.c +++ b/protocols/jabber/message.c @@ -26,7 +26,6 @@ static xt_status jabber_pkt_message_normal(struct xt_node *node, gpointer data, gboolean carbons_sent) { struct im_connection *ic = data; - struct jabber_data *jd = ic->proto_data; char *from = xt_find_attr(node, carbons_sent ? "to" : "from"); char *type = xt_find_attr(node, "type"); char *id = xt_find_attr(node, "id"); @@ -39,17 +38,6 @@ static xt_status jabber_pkt_message_normal(struct xt_node *node, gpointer data, return XT_HANDLED; /* Consider this packet corrupted. */ } - /* try to detect hipchat's own version of self-messages */ - if (jd->flags & JFLAG_HIPCHAT) { - struct xt_node *c; - - if ((c = xt_find_node_by_attr(node->children, "delay", "xmlns", XMLNS_DELAY)) && - (s = xt_find_attr(c, "from_jid")) && - jabber_compare_jid(s, jd->me)) { - carbons_sent = TRUE; - } - } - if (request && id && g_strcmp0(type, "groupchat") != 0 && !carbons_sent) { /* Send a message receipt (XEP-0184), looking like this: * <message from='...' id='...' to='...'> |