Changeset 35f6677


Ignore:
Timestamp:
2006-10-21T20:48:44Z (15 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
4b0d805
Parents:
3b3cd693
Message:

Proper detections of errors from *_connect() and added a "Connecting"
message in jabber_login().

Location:
protocols/jabber
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/io.c

    r3b3cd693 r35f6677  
    102102                st = write( jd->fd, jd->txq, jd->tx_len );
    103103       
    104 //      if( st > 0 ) write( 1, jd->txq, st );
    105        
    106104        if( st == jd->tx_len )
    107105        {
     
    156154        else
    157155                st = read( jd->fd, buf, sizeof( buf ) );
    158        
    159 //      if( st > 0 ) write( 1, buf, st );
    160156       
    161157        if( st > 0 )
  • protocols/jabber/jabber.c

    r3b3cd693 r35f6677  
    159159                connect_to = jd->server;
    160160       
     161        set_login_progress( gc, "Connecting" );
     162       
    161163        /* For non-SSL connections we can try to use the port # from the SRV
    162164           reply, but let's not do that when using SSL, SSL usually runs on
     
    171173                jd->fd = proxy_connect( connect_to, srv ? srv->port : set_getint( &acc->set, "port" ), jabber_connected_plain, gc );
    172174        }
    173        
    174175        g_free( srv );
     176       
     177        if( jd->fd == -1 )
     178        {
     179                hide_login_progress( gc, "Could not connect to server" );
     180                signoff( gc );
     181        }
    175182}
    176183
Note: See TracChangeset for help on using the changeset viewer.