2006-07-25 [colin] 2.3.1cvs85

	* src/mainwindow.c
	* src/common/socket.h
	* src/etpan/imap-thread.c
		Refresh resolvers before connecting
		to IMAP servers, and after switching
		to online. Thanks to Paul.

diff --git a/ChangeLog b/ChangeLog
index 65060b9d54e6798ce3f632592f761eedfc0844a1..c06435ae823bb245c4de81f3ec4fc1affa9089e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-25 [colin]     2.3.1cvs85
+
+       * src/mainwindow.c
+       * src/common/socket.h
+       * src/etpan/imap-thread.c
+               Refresh resolvers before connecting
+               to IMAP servers, and after switching
+               to online. Thanks to Paul.
+
 2006-07-18 [colin]
 
        * 2.4.0-rc4 released

diff --git a/PATCHSETS b/PATCHSETS
index a014a12be27b1e90791bc6993edc1339b903c2d9..92140f70edfda19c8fdbdeb9fe14c8bead15f8f5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1685,3 +1685,4 @@
 ( cvs diff -u -r 1.94.2.90 -r 1.94.2.91 src/messageview.c;  ) > 2.3.1cvs82.patchset
 ( diff -u /dev/null sylpheed-claws.ico;  ) > 2.3.1cvs83.patchset
 ( cvs diff -u -r 1.149.2.53 -r 1.149.2.54 src/inc.c;  ) > 2.3.1cvs84.patchset
+( cvs diff -u -r 1.274.2.125 -r 1.274.2.126 src/mainwindow.c;  cvs diff -u -r 1.13.2.6 -r 1.13.2.7 src/common/socket.h;  cvs diff -u -r 1.1.4.45 -r 1.1.4.46 src/etpan/imap-thread.c;  ) > 2.3.1cvs85.patchset

diff --git a/configure.ac b/configure.ac
index 65020caf19f82d0d684a6eaaa8067d23fcb7516a..014a67f6601a5f1ea46d6b308c27c5d39fb8945a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=84
+EXTRA_VERSION=85
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/socket.h b/src/common/socket.h
index cec55222ff248d69504428bbe84885db88c7b987..de655e80b38fca6dcf5803e5eb57aa44e4ba5584 100644 (file)
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -69,6 +69,7 @@ struct _SockInfo
        GIOCondition condition;
 };
 
+void refresh_resolvers                 (void);
 gint sock_init                         (void);
 gint sock_cleanup                      (void);
 

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 692ccfc21c83f95a9c956027774ed62373e52bcc..0ee012d502bc0f607dc3294af8d1c4223c19792a 100644 (file)
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -20,6 +20,7 @@
 #include "etpan-thread-manager.h"
 #include "utils.h"
 #include "ssl_certificate.h"
+#include "socket.h"
 
 #define DISABLE_LOG_DURING_LOGIN
 
@@ -357,6 +358,7 @@ int imap_threaded_connect(Folder * folder, const char * server, int port)
        param.server = server;
        param.port = port;
        
+       refresh_resolvers();
        threaded_run(folder, &param, &result, connect_run);
        
        debug_print("connect ok %i\n", result.error);
@@ -427,6 +429,7 @@ int imap_threaded_connect_ssl(Folder * folder, const char * server, int port)
        param.server = server;
        param.port = port;
        
+       refresh_resolvers();
        threaded_run(folder, &param, &result, connect_ssl_run);
        
        if (result.error >= 0 && !etpan_skip_ssl_cert_check) {

diff --git a/src/mainwindow.c b/src/mainwindow.c
index b9b28ff831551a7051765759da0402023129fa51..9bf3bb90838a079d8543078bbbd7258bc4175ffd 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -95,6 +95,7 @@
 #include "colorlabel.h"
 #include "textview.h"
 #include "imap.h"
+#include "socket.h"
 
 #define AC_LABEL_WIDTH 240
 
@@ -3155,6 +3156,7 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
                menuitem->active = FALSE;
                prefs_common.work_offline = FALSE;
                inc_autocheck_timer_set();
+               refresh_resolvers();
        }
 }