aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/jabber/presence.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2010-03-18 14:38:06 +0000
committerWilmer van der Gaast <wilmer@gaast.net>2010-03-18 14:38:06 +0000
commit638feab58aebc97d646820dd1bc9b8d9fbeec29d (patch)
treec4022afb6ffef2b672f3aaf16c8bd7a9f7b23ea8 /protocols/jabber/presence.c
parent6ce01bec119c96243a8d43e28681cc512fbd0950 (diff)
parent842cd8dbfb98b61af33b5fe481364c3cfbeaca04 (diff)
Merging in Jabber resource selection fix. This adds the activity_timeout
setting, which makes BitlBee send a message to bare JIDs if there was no recent seen activity from any of the person's resources. This should fix most issues with messages going to the wrong resource (i.e. someone's mobile phone instead of something more sensible).
Diffstat (limited to 'protocols/jabber/presence.c')
-rw-r--r--protocols/jabber/presence.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/protocols/jabber/presence.c b/protocols/jabber/presence.c
index 28aaea1b..006eeead 100644
--- a/protocols/jabber/presence.c
+++ b/protocols/jabber/presence.c
@@ -67,9 +67,6 @@ xt_status jabber_pkt_presence( struct xt_node *node, gpointer data )
else
{
bud->away_state = NULL;
- /* Let's only set last_act if there's *no* away state,
- since it could be some auto-away thingy. */
- bud->last_act = time( NULL );
}
if( ( c = xt_find_node( node->children, "priority" ) ) && c->text_len > 0 )