sync with sylpheed 0.6.2cvs1

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 04367abab4ce29e2b5fd3292536efc2cc21fd7ee..208ea5dd72d079d8bc8b23005fffb232699045f9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -79,6 +79,8 @@
 #  include "ssl.h"
 #endif
 
+#include "version.h"
+
 gchar *prog_version;
 gchar *startup_dir;
 gboolean debug_mode = FALSE;
@@ -246,6 +248,7 @@ int main(int argc, char *argv[])
        prefs_display_header_read_config();
        prefs_display_header_write_config();
        prefs_filtering_read_config();
+       addressbook_read_file();
 
        gtkut_widget_init();
 
@@ -276,6 +279,8 @@ int main(int argc, char *argv[])
 
        prefs_scoring_read_config();
 
+       addressbook_read_file();
+
        inc_autocheck_timer_init(mainwin);
 
        if (cmd.receive_all || prefs_common.chk_on_startup)
@@ -370,6 +375,8 @@ void app_will_exit(GtkWidget *widget, gpointer data)
                manage_window_focus_in(mainwin->window, NULL, NULL);
        }
 
+       inc_autocheck_timer_remove();
+
        if (prefs_common.clean_on_exit)
                main_window_empty_trash(mainwin, prefs_common.ask_on_clean);