Changeset 3ddbd23c for protocols/jabber/jabber.c

Timestamp:

2015-07-29T21:48:14Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

69b94c3

Parents:

10d089d (diff), 73dd021 (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 remote-tracking branch 'origin/develop' into parson

Conflicts:

lib/json.c - Yep, no longer exists in the branch so not important.

File:

• protocols/jabber/jabber.c (modified) (1 diff)

protocols/jabber/jabber.c

@@ -85 +85 @@
                 set_setstr(&acc->set, "server", "chat.hipchat.com");
         } else {
-                s = set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
+                set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
+
+                /* this reuses set_eval_oauth, which clears the password */
+                set_add(&acc->set, "anonymous", "false", set_eval_oauth, acc);
         }