2009-08-20 [colin] 3.7.2cvs18

	* src/main.c
		Fix crash when accessing IMAP soon

diff --git a/ChangeLog b/ChangeLog
index ef990b1ca772a3b85146752f156674305e7df4c9..96db8e0ab487f1c821f325b0756936eeae9108e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-20 [colin]     3.7.2cvs18
+
+       * src/main.c
+               Fix crash when accessing IMAP soon
+

 2009-08-18 [colin]     3.7.2cvs17
 
        * src/ldapquery.c
 2009-08-18 [colin]     3.7.2cvs17
 
        * src/ldapquery.c

diff --git a/PATCHSETS b/PATCHSETS
index 1e0778150497a5c8748cbb84711e06f8d1a1d96a..409ffa18cf26de1ed884ca1a2c40ce392f16ec1e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3842,3 +3842,4 @@
 ( cvs diff -u -r 1.61.2.94 -r 1.61.2.95 src/account.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/addrcustomattr.c;  cvs diff -u -r 1.9.2.29 -r 1.9.2.30 src/addressadd.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/addressbook_foldersel.c;  cvs diff -u -r 1.5.10.28 -r 1.5.10.29 src/addrgather.c;  cvs diff -u -r 1.2.4.23 -r 1.2.4.24 src/browseldap.c;  cvs diff -u -r 1.382.2.518 -r 1.382.2.519 src/compose.c;  cvs diff -u -r 1.5.12.14 -r 1.5.12.15 src/editbook.c;  cvs diff -u -r 1.11.2.23 -r 1.11.2.24 src/editgroup.c;  cvs diff -u -r 1.5.12.16 -r 1.5.12.17 src/editjpilot.c;  cvs diff -u -r 1.8.2.35 -r 1.8.2.36 src/editldap.c;  cvs diff -u -r 1.10.2.16 -r 1.10.2.17 src/editldap_basedn.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/edittags.c;  cvs diff -u -r 1.5.12.15 -r 1.5.12.16 src/editvcard.c;  cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/exphtmldlg.c;  cvs diff -u -r 1.1.4.31 -r 1.1.4.32 src/expldifdlg.c;  cvs diff -u -r 1.8.2.28 -r 1.8.2.29 src/export.c;  cvs diff -u -r 1.26.2.43 -r 1.26.2.44 src/foldersel.c;  cvs diff -u -r 1.13.2.27 -r 1.13.2.28 src/import.c;  cvs diff -u -r 1.14.2.23 -r 1.14.2.24 src/importldif.c;  cvs diff -u -r 1.4.12.20 -r 1.4.12.21 src/importmutt.c;  cvs diff -u -r 1.1.14.20 -r 1.1.14.21 src/importpine.c;  cvs diff -u -r 1.60.2.69 -r 1.60.2.70 src/prefs_actions.c;  cvs diff -u -r 1.16.2.38 -r 1.16.2.39 src/prefs_customheader.c;  cvs diff -u -r 1.16.2.37 -r 1.16.2.38 src/prefs_display_header.c;  cvs diff -u -r 1.59.2.79 -r 1.59.2.80 src/prefs_filtering.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_folder_column.c;  cvs diff -u -r 1.43.2.80 -r 1.43.2.81 src/prefs_matcher.c;  cvs diff -u -r 1.10.2.25 -r 1.10.2.26 src/prefs_summary_column.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_summary_open.c;  cvs diff -u -r 1.12.2.70 -r 1.12.2.71 src/prefs_template.c;  cvs diff -u -r 1.96.2.219 -r 1.96.2.220 src/textview.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/uri_opener.c;  ) > 3.7.2cvs15.patchset
 ( cvs diff -u -r 1.43.2.109 -r 1.43.2.110 src/toolbar.c;  ) > 3.7.2cvs16.patchset
 ( cvs diff -u -r 1.3.2.32 -r 1.3.2.33 src/ldapquery.c;  ) > 3.7.2cvs17.patchset
 ( cvs diff -u -r 1.61.2.94 -r 1.61.2.95 src/account.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/addrcustomattr.c;  cvs diff -u -r 1.9.2.29 -r 1.9.2.30 src/addressadd.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/addressbook_foldersel.c;  cvs diff -u -r 1.5.10.28 -r 1.5.10.29 src/addrgather.c;  cvs diff -u -r 1.2.4.23 -r 1.2.4.24 src/browseldap.c;  cvs diff -u -r 1.382.2.518 -r 1.382.2.519 src/compose.c;  cvs diff -u -r 1.5.12.14 -r 1.5.12.15 src/editbook.c;  cvs diff -u -r 1.11.2.23 -r 1.11.2.24 src/editgroup.c;  cvs diff -u -r 1.5.12.16 -r 1.5.12.17 src/editjpilot.c;  cvs diff -u -r 1.8.2.35 -r 1.8.2.36 src/editldap.c;  cvs diff -u -r 1.10.2.16 -r 1.10.2.17 src/editldap_basedn.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/edittags.c;  cvs diff -u -r 1.5.12.15 -r 1.5.12.16 src/editvcard.c;  cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/exphtmldlg.c;  cvs diff -u -r 1.1.4.31 -r 1.1.4.32 src/expldifdlg.c;  cvs diff -u -r 1.8.2.28 -r 1.8.2.29 src/export.c;  cvs diff -u -r 1.26.2.43 -r 1.26.2.44 src/foldersel.c;  cvs diff -u -r 1.13.2.27 -r 1.13.2.28 src/import.c;  cvs diff -u -r 1.14.2.23 -r 1.14.2.24 src/importldif.c;  cvs diff -u -r 1.4.12.20 -r 1.4.12.21 src/importmutt.c;  cvs diff -u -r 1.1.14.20 -r 1.1.14.21 src/importpine.c;  cvs diff -u -r 1.60.2.69 -r 1.60.2.70 src/prefs_actions.c;  cvs diff -u -r 1.16.2.38 -r 1.16.2.39 src/prefs_customheader.c;  cvs diff -u -r 1.16.2.37 -r 1.16.2.38 src/prefs_display_header.c;  cvs diff -u -r 1.59.2.79 -r 1.59.2.80 src/prefs_filtering.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_folder_column.c;  cvs diff -u -r 1.43.2.80 -r 1.43.2.81 src/prefs_matcher.c;  cvs diff -u -r 1.10.2.25 -r 1.10.2.26 src/prefs_summary_column.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_summary_open.c;  cvs diff -u -r 1.12.2.70 -r 1.12.2.71 src/prefs_template.c;  cvs diff -u -r 1.96.2.219 -r 1.96.2.220 src/textview.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/uri_opener.c;  ) > 3.7.2cvs15.patchset
 ( cvs diff -u -r 1.43.2.109 -r 1.43.2.110 src/toolbar.c;  ) > 3.7.2cvs16.patchset
 ( cvs diff -u -r 1.3.2.32 -r 1.3.2.33 src/ldapquery.c;  ) > 3.7.2cvs17.patchset

+( cvs diff -u -r 1.115.2.221 -r 1.115.2.222 src/main.c;  ) > 3.7.2cvs18.patchset

diff --git a/configure.ac b/configure.ac
index 8250507bfa58379171e0edd6379da4e29206edcf..5981e853c1f7039d85c20df92e883258e7d38b4a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=17
+EXTRA_VERSION=18

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index f76dc4af63fb4430d8e286ffa8941d757372ddd5..3eb970ca9e26f70276f823d35259b4cecd3028dd 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1383,6 +1383,11 @@ int main(int argc, char *argv[])
        prefs_account_init();
        account_read_config_all();
 
        prefs_account_init();
        account_read_config_all();
 

+#ifdef HAVE_LIBETPAN
+       imap_main_init(prefs_common.skip_ssl_cert_check);
+       imap_main_set_timeout(prefs_common.io_timeout_secs);
+       nntp_main_init(prefs_common.skip_ssl_cert_check);
+#endif 

        /* If we can't read a folder list or don't have accounts,
         * it means the configuration's not done. Either this is
         * a brand new install, either a failed/refused migration.
        /* If we can't read a folder list or don't have accounts,
         * it means the configuration's not done. Either this is
         * a brand new install, either a failed/refused migration.


@@ -1438,11 +1443,6 @@ int main(int argc, char *argv[])
        if (claws_crashed())
                main_window_popup(mainwin);
 
        if (claws_crashed())
                main_window_popup(mainwin);
 

-#ifdef HAVE_LIBETPAN
-       imap_main_init(prefs_common.skip_ssl_cert_check);
-       imap_main_set_timeout(prefs_common.io_timeout_secs);
-       nntp_main_init(prefs_common.skip_ssl_cert_check);
-#endif 

        account_set_missing_folder();
        folder_set_missing_folders();
        folderview_set(folderview);
        account_set_missing_folder();
        folder_set_missing_folders();
        folderview_set(folderview);