merged gtk2_imap_c branch with HEAD

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 6aa62ebd51c3052cc0ad05f0529e30de14a680bf..b769df449846bf706c579233c672cb54a6fc4334 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -89,6 +89,7 @@
 #include "imap_gtk.h"
 #include "news_gtk.h"
 #include "matcher.h"
+#include "imap-thread.h"
 
 #if USE_OPENSSL
 #  include "ssl.h"
@@ -334,7 +335,8 @@ int main(int argc, char *argv[])
 #endif
        
        sock_set_io_timeout(prefs_common.io_timeout_secs);
-
+       imap_main_set_timeout(prefs_common.io_timeout_secs);
+       
        prefs_actions_read_config();
        prefs_display_header_read_config();
        /* prefs_filtering_read_config(); */
@@ -375,6 +377,8 @@ int main(int argc, char *argv[])
                        exit_sylpheed(mainwin);
        }
 
+       imap_main_init();
+       
        account_set_missing_folder();
        folder_set_missing_folders();
        folderview_set(folderview);
@@ -468,6 +472,8 @@ static void exit_sylpheed(MainWindow *mainwin)
 
        debug_print("shutting down\n");
 
+       imap_main_done();
+       
        inc_autocheck_timer_remove();
 
        if (prefs_common.clean_on_exit)