2007-07-30 [paul] 2.10.0cvs79

	* src/main.c
		Fix IMAP timeout setting

diff --git a/ChangeLog b/ChangeLog
index 6a9df3bd077f84072aa3a568d6433bd916b0f6ab..b494e2a4a0d968bd5f5e79974669cef0bd27de93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-30 [paul]      2.10.0cvs79
+
+       * src/main.c
+               Fix IMAP timeout setting
+
 2007-07-30 [colin]     2.10.0cvs78
 
        * src/prefs_account.c

diff --git a/PATCHSETS b/PATCHSETS
index 6be60c08b9d085622f8144b709db2c544b59e9d1..3069a53577dccc014f1fc8f51004ec7cc9ee3b95 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2732,3 +2732,4 @@
 ( cvs diff -u -r 1.382.2.396 -r 1.382.2.397 src/compose.c;  ) > 2.10.0cvs76.patchset
 ( cvs diff -u -r 1.25.2.31 -r 1.25.2.32 src/matcher_parser_parse.y;  cvs diff -u -r 1.1.4.38 -r 1.1.4.39 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.59 -r 1.43.2.60 src/prefs_matcher.c;  ) > 2.10.0cvs77.patchset
 ( cvs diff -u -r 1.105.2.103 -r 1.105.2.104 src/prefs_account.c;  ) > 2.10.0cvs78.patchset
+( cvs diff -u -r 1.115.2.161 -r 1.115.2.162 src/main.c;  ) > 2.10.0cvs79.patchset

diff --git a/configure.ac b/configure.ac
index 5aa7543771862b90834e94905c6dc61cb2d5bae1..983bbfe3997cdcd5681d256a753a35422cb2c3d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=78
+EXTRA_VERSION=79
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index e3df50307d7744590f26941c8c539242002d2753..f3458725dcfc9252150bd025d832e6114010cc44 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -883,9 +883,6 @@ int main(int argc, char *argv[])
 #endif
 
        sock_set_io_timeout(prefs_common.io_timeout_secs);
-#ifdef HAVE_LIBETPAN
-       imap_main_set_timeout(prefs_common.io_timeout_secs);
-#endif
        prefs_actions_read_config();
        prefs_display_header_read_config();
        /* prefs_filtering_read_config(); */
@@ -990,6 +987,7 @@ int main(int argc, char *argv[])
 
 #ifdef HAVE_LIBETPAN
        imap_main_init(prefs_common.skip_ssl_cert_check);
+       imap_main_set_timeout(prefs_common.io_timeout_secs);
 #endif 
        account_set_missing_folder();
        folder_set_missing_folders();