Changeset 4cb21b7

Timestamp:

2013-01-13T11:11:26Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

35571fb, fffabad

Parents:

106f19c

Message:

Don't set up the account_on_timeout() timer if *_login() called
imcb_connected() immediately. It's an unusual thing to do since normally
there's a bunch of I/O that needs to happen first, but some plugins would
like to do this.

File:

• protocols/account.c (modified) (2 diffs)

protocols/account.c

@@ -350 +350 @@
         a->prpl->login( a );
         
-        if( a->ic && !( a->ic->flags & OPT_SLOW_LOGIN ) )
+        if( a->ic && !( a->ic->flags & ( OPT_SLOW_LOGIN | OPT_LOGGED_IN ) ) )
                 a->ic->keepalive = b_timeout_add( 120000, account_on_timeout, a->ic );
 }
@@ -369 +369 @@
         struct im_connection *ic = d;
         
-        imcb_error( ic, "Connection timeout" );
-        imc_logout( ic, TRUE );
+        if( !( ic->flags & ( OPT_SLOW_LOGIN | OPT_LOGGED_IN ) ) )
+        {
+                imcb_error( ic, "Connection timeout" );
+                imc_logout( ic, TRUE );
+        }
         
         return FALSE;