Changeset 35f6677

Timestamp:

2006-10-21T20:48:44Z (18 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:

• io.c (modified) (2 diffs)
• jabber.c (modified) (2 diffs)

protocols/jabber/io.c

@@ -102 +102 @@
                 st = write( jd->fd, jd->txq, jd->tx_len );
         
-//      if( st > 0 ) write( 1, jd->txq, st );
-        
         if( st == jd->tx_len )
         {
@@ -156 +154 @@
         else
                 st = read( jd->fd, buf, sizeof( buf ) );
-        
-//      if( st > 0 ) write( 1, buf, st );
         
         if( st > 0 )

protocols/jabber/jabber.c

@@ -159 +159 @@
                 connect_to = jd->server;
         
+        set_login_progress( gc, "Connecting" );
+        
         /* For non-SSL connections we can try to use the port # from the SRV
            reply, but let's not do that when using SSL, SSL usually runs on
@@ -171 +173 @@
                 jd->fd = proxy_connect( connect_to, srv ? srv->port : set_getint( &acc->set, "port" ), jabber_connected_plain, gc );
         }
-        
         g_free( srv );
+        
+        if( jd->fd == -1 )
+        {
+                hide_login_progress( gc, "Could not connect to server" );
+                signoff( gc );
+        }
 }