Changeset 3fbce97 for protocols/jabber/presence.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (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 branch 'master' into parson

File:

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

protocols/jabber/presence.c

@@ -186 +186 @@
         char *prio = set_getstr(&ic->acc->set, "priority");
 
-        if (jd->away_state->code != NULL) {
+        if (jd->away_state && jd->away_state->full_name != NULL) {
                 int new_prio = (atoi(prio) - 5);
                 if (new_prio < 0) {
@@ -222 +222 @@
         cap = xt_new_node("c", NULL, NULL);
         xt_add_attr(cap, "xmlns", XMLNS_CAPS);
-        xt_add_attr(cap, "node", "http://bitlbee.org/xmpp/caps");
+
+        if (jd->flags & JFLAG_HIPCHAT) {
+                /* hipchat specific node, whitelisted by request to receive self-messages */
+                xt_add_attr(cap, "node", "http://bitlbee.org/xmpp/caps/hipchat");
+        } else {
+                xt_add_attr(cap, "node", "http://bitlbee.org/xmpp/caps");
+        }
         xt_add_attr(cap, "ver", BITLBEE_VERSION);   /* The XEP wants this hashed, but nobody's doing that. */
         xt_add_child(node, cap);