diff options
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | doc/user-guide/commands.xml | 2 | ||||
| -rw-r--r-- | protocols/jabber/jabber.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index cbd8d737..1cac2dc7 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -18,6 +18,9 @@ Version 1.2.5: - Auto reconnect is now enabled by default since all protocols can properly detect cases where auto reconnect should be avoided (i.e. concurrent logins). +- Changed the default resource_select setting which should reduce message + routing issues on Jabber (i.e. messages going someone's phone instead of + the main client). Fixed 17 Mar 2010 diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml index 931608ee..700df7bb 100644 --- a/doc/user-guide/commands.xml +++ b/doc/user-guide/commands.xml @@ -715,7 +715,7 @@ </bitlbee-setting> <bitlbee-setting name="resource_select" type="string" scope="account"> - <default>priority</default> + <default>activity</default> <possible-values>priority, activity</possible-values> <description> diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c index eca7d2d3..a1fb8817 100644 --- a/protocols/jabber/jabber.c +++ b/protocols/jabber/jabber.c @@ -66,7 +66,7 @@ static void jabber_init( account_t *acc ) s = set_add( &acc->set, "resource", "BitlBee", NULL, acc ); s->flags |= ACC_SET_OFFLINE_ONLY; - s = set_add( &acc->set, "resource_select", "priority", NULL, acc ); + s = set_add( &acc->set, "resource_select", "activity", NULL, acc ); s = set_add( &acc->set, "server", NULL, set_eval_account, acc ); s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK; |