2005-07-16 [colin] 1.9.12cvs65

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 3bf5a6f8a6d15752d5f3e60af1ec60c21c115f93..43d5d10704b090ff56f771b7949134101667b5c5 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -89,6 +89,10 @@
 #include "imap_gtk.h"
 #include "news_gtk.h"
 #include "matcher.h"
+#ifdef HAVE_LIBETPAN
+#include "imap-thread.h"
+#endif
+#include "stock_pixmap.h"
 
 #if USE_OPENSSL
 #  include "ssl.h"
@@ -227,6 +231,7 @@ int main(int argc, char *argv[])
        gchar *userrc;
        MainWindow *mainwin;
        FolderView *folderview;
+       GdkPixbuf *icon;
 
        if (!sylpheed_init(&argc, &argv)) {
                return 0;
@@ -267,7 +272,7 @@ int main(int argc, char *argv[])
        }
 
        g_thread_init(NULL);
-       gdk_threads_init();
+       /* gdk_threads_init(); */
 
        gtk_set_locale();
        gtk_init(&argc, &argv);
@@ -334,7 +339,9 @@ 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(); */
@@ -342,6 +349,8 @@ int main(int argc, char *argv[])
        renderer_read_config();
 
        gtkut_widget_init();
+       stock_pixbuf_gdk(NULL, STOCK_PIXMAP_SYLPHEED_ICON, &icon);
+       gtk_window_set_default_icon(icon);
 
        folderview_initialize();
        mh_gtk_init();
@@ -375,6 +384,9 @@ int main(int argc, char *argv[])
                        exit_sylpheed(mainwin);
        }
 
+#ifdef HAVE_LIBETPAN
+       imap_main_init();
+#endif 
        account_set_missing_folder();
        folder_set_missing_folders();
        folderview_set(folderview);
@@ -467,7 +479,9 @@ static void exit_sylpheed(MainWindow *mainwin)
        gchar *filename;
 
        debug_print("shutting down\n");
-
+#ifdef HAVE_LIBETPAN
+       imap_main_done();
+#endif
        inc_autocheck_timer_remove();
 
        if (prefs_common.clean_on_exit)