really fix the Connecting... status
authorColin Leroy <colin@colino.net>
Tue, 4 Feb 2003 14:23:26 +0000 (14:23 +0000)
committerColin Leroy <colin@colino.net>
Tue, 4 Feb 2003 14:23:26 +0000 (14:23 +0000)
ChangeLog.claws
configure.ac
src/inc.c

index cd0400b..08b3bfb 100644 (file)
@@ -1,3 +1,8 @@
+2003-02-04 [colin]     0.8.9claws38
+
+       * src/inc.c
+               _really_ fix this Connecting... status
+
 2003-02-04 [paul]      0.8.9claws37
 
        * sync with 0.8.10
index 60a3689..94dcb0d 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws37
+EXTRA_VERSION=claws38
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 2053be4..0122ee2 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -690,7 +690,7 @@ static IncState inc_pop3_session_do(IncSession *session)
        Pop3State *pop3_state = session->pop3_state;
        IncProgressDialog *inc_dialog = (IncProgressDialog *)session->data;
        Automaton *atm;
-       SockInfo *sockinfo;
+       SockInfo *sockinfo = NULL;
        gint i;
        gchar *server;
        gushort port;
@@ -753,13 +753,16 @@ static IncState inc_pop3_session_do(IncSession *session)
        statusbar_verbosity_set(TRUE);
        buf = g_strdup_printf(_("Connecting to POP3 server: %s ..."), server);
        log_message("%s\n", buf);
-       statusbar_verbosity_set(FALSE);
 
        progress_dialog_set_label(inc_dialog->dialog, buf);
        g_free(buf);
        GTK_EVENTS_FLUSH();
 
-       if ((sockinfo = sock_connect(server, port)) == NULL) {
+       sockinfo = sock_connect(server, port);
+
+       statusbar_verbosity_set(FALSE);
+
+       if (sockinfo == NULL) {
                log_warning(_("Can't connect to POP3 server: %s:%d\n"),
                            server, port);
                if(!prefs_common.no_recv_err_panel) {