Changeset 3261

Show
Ignore:
Timestamp:
01/15/08 17:19:21
Author:
pvanhoof
Message:

2008-01-15 Philip Van Hoof <pvanhoof@gnome.org>

        • Better error reporting on connection failures
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r3260 r3261  
     12008-01-15  Philip Van Hoof <pvanhoof@gnome.org> 
     2 
     3        * Better error reporting on connection failures 
     4 
    152008-01-15 Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com> 
    26 

  • trunk/libtinymail-camel/camel-lite/camel/camel-file-utils.h

    r2950 r3261  
    5050#define NONBLOCKING_WRITE_TIMEOUT 0 
    5151 
    52 #define CONNECT_TIMEOUT 30 
     52#define CONNECT_TIMEOUT 15 
    5353 
    5454 

  • trunk/libtinymail-camel/camel-lite/camel/camel-tcp-stream-ssl.c

    r3173 r3261  
    13591359 
    13601360                                if (poll[1].out_flags == PR_POLL_READ) { 
    1361                                         errno = EINTR; 
     1361                                        set_errno (PR_GetError ()); 
    13621362                                        goto exception; 
    13631363                                } 

  • trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c

    r3259 r3261  
    901901 
    902902        if (camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai) == -1) { 
    903                 if (errno == EINTR) 
    904                         camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, 
    905                                              _("Connection cancelled")); 
    906                 else 
    907903                        camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, 
    908904                                              _("Could not connect to %s: %s"), 

  • trunk/libtinymail-gnome-desktop/tny-gnome-device.c

    r3250 r3261  
    250250tny_gnome_device_finalize (GObject *object) 
    251251{ 
    252         TnyGnomeDevice *self = (TnyGnomeDevice *)object;         
    253         TnyGnomeDevicePriv *priv = TNY_GNOME_DEVICE_GET_PRIVATE (self); 
    254  
    255 #ifdef GNOME 
    256         if (!priv->invnm) 
    257         { 
     252        TnyGnomeDevice *self = (TnyGnomeDevice *)object; 
     253        TnyGnomeDevicePriv *priv = TNY_GNOME_DEVICE_GET_PRIVATE (self); 
     254 
     255#ifdef GNOME 
     256        if (!priv->invnm) { 
    258257                libnm_glib_unregister_callback (priv->nm_ctx, priv->callback_id); 
    259258                libnm_glib_shutdown (priv->nm_ctx);