diff options
| author | Marius Halden <marius.h@lden.org> | 2016-07-06 21:04:39 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-07-06 21:04:39 +0200 |
| commit | 2f2fb6dda408ad2562cc754e2ca0ad3c2ea8bc8e (patch) | |
| tree | 8fb3727ea51728ea0ee4c075f53ce93b1ef12161 /protocols/jabber/jabber.c | |
| parent | fd86ad18b56b77321d3e235594b6ae7e4f7acabd (diff) | |
| parent | 7e41de51bd6466306f21e1d2bf54b3251c1bf08e (diff) | |
Merge branch 'scram' into patched-master
Diffstat (limited to 'protocols/jabber/jabber.c')
| -rw-r--r-- | protocols/jabber/jabber.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c index 2fa19c0f..fcd90598 100644 --- a/protocols/jabber/jabber.c +++ b/protocols/jabber/jabber.c @@ -116,6 +116,9 @@ static void jabber_init(account_t *acc) s = set_add(&acc->set, "carbons", "true", set_eval_bool, acc); s->flags |= ACC_SET_OFFLINE_ONLY; + s = set_add(&acc->set, "disable_scram", "false", set_eval_bool, acc); + s->flags |= SET_HIDDEN_DEFAULT; + acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE | ACC_FLAG_HANDLE_DOMAINS; } @@ -379,6 +382,7 @@ static void jabber_logout(struct im_connection *ic) g_free(jd->me); g_free(jd->challenge.cnonce); g_free(jd->challenge.server_signature); + g_free(jd->challenge.cb_header); g_free(jd); jabber_connections = g_slist_remove(jabber_connections, ic); |