Changeset 537d9b9 for protocols/jabber/message.c

Timestamp:

2016-11-20T08:40:36Z (8 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master up to commit '9f03c47' into parson

File:

• protocols/jabber/message.c (modified) (2 diffs)

protocols/jabber/message.c

@@ -27 +27 @@
 {
         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");
@@ -38 +37 @@
         if (!from) {
                 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;
-                }
         }