Ignore:
Timestamp:
2015-07-29T21:48:14Z (5 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:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/jabber.c

    r10d089d r3ddbd23c  
    8585                set_setstr(&acc->set, "server", "chat.hipchat.com");
    8686        } else {
    87                 s = set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
     87                set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
     88
     89                /* this reuses set_eval_oauth, which clears the password */
     90                set_add(&acc->set, "anonymous", "false", set_eval_oauth, acc);
    8891        }
    8992
Note: See TracChangeset for help on using the changeset viewer.