aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/nogaim.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2010-11-21 15:23:54 +0000
committerWilmer van der Gaast <wilmer@gaast.net>2010-11-21 15:23:54 +0000
commit748bcdde269da5cd8184418f0df334e12338a541 (patch)
tree5e046d6d0426872666722ceab8b04e48296f8360 /protocols/nogaim.c
parentbb151f7aad467bf29c6e5ca552088f7f0b8ec876 (diff)
Time out if logging in takes too long (2m for now). Except for Twitter
OAuth login, which requires user action. This mostly solves problems with OSCAR login silently failing, but may also be useful in other places.
Diffstat (limited to 'protocols/nogaim.c')
-rw-r--r--protocols/nogaim.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/protocols/nogaim.c b/protocols/nogaim.c
index aa3ad5bb..8fb85ea7 100644
--- a/protocols/nogaim.c
+++ b/protocols/nogaim.c
@@ -276,6 +276,7 @@ void imcb_connected( struct im_connection *ic )
imcb_log( ic, "Logged in" );
+ b_event_remove( ic->keepalive );
ic->keepalive = b_timeout_add( 60000, send_keepalive, ic );
ic->flags |= OPT_LOGGED_IN;