Changeset 4cb21b7 for protocols


Ignore:
Timestamp:
2013-01-13T11:11:26Z (8 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:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/account.c

    r106f19c r4cb21b7  
    350350        a->prpl->login( a );
    351351       
    352         if( a->ic && !( a->ic->flags & OPT_SLOW_LOGIN ) )
     352        if( a->ic && !( a->ic->flags & ( OPT_SLOW_LOGIN | OPT_LOGGED_IN ) ) )
    353353                a->ic->keepalive = b_timeout_add( 120000, account_on_timeout, a->ic );
    354354}
     
    369369        struct im_connection *ic = d;
    370370       
    371         imcb_error( ic, "Connection timeout" );
    372         imc_logout( ic, TRUE );
     371        if( !( ic->flags & ( OPT_SLOW_LOGIN | OPT_LOGGED_IN ) ) )
     372        {
     373                imcb_error( ic, "Connection timeout" );
     374                imc_logout( ic, TRUE );
     375        }
    373376       
    374377        return FALSE;
Note: See TracChangeset for help on using the changeset viewer.