Changeset 6e9ae72 for protocols/jabber/jabber.c

Timestamp:

2011-12-17T13:50:01Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

18c6d36

Parents:

87dddee (diff), 17f057d (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:

Mainline merge.

File:

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

protocols/jabber/jabber.c

@@ -84 +84 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
+        s = set_add( &acc->set, "sasl", "true", set_eval_bool, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY | SET_HIDDEN_DEFAULT;
+
         s = set_add( &acc->set, "user_agent", "BitlBee", NULL, acc );