2005-07-16 [colin] 1.9.12cvs65
[claws.git] / src / main.c
index 6969836b0cddf04a480339a4401cfc2e61d11e4d..43d5d10704b090ff56f771b7949134101667b5c5 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkrc.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <signal.h>
-
-#if USE_GPGME
-#  include <gpgme.h>
-#  include "passphrase.h"
+#include "wizard.h"
+#ifdef HAVE_STARTUP_NOTIFICATION
+# define SN_API_NOT_YET_FROZEN
+# include <libsn/sn-launchee.h>
+# include <gdk/gdkx.h>
 #endif
 
 #include "sylpheed.h"
-#include "intl.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "folderview.h"
+#include "image_viewer.h"
 #include "summaryview.h"
 #include "prefs_common.h"
 #include "prefs_account.h"
 #include "prefs_actions.h"
+#include "prefs_ext_prog.h"
+#include "prefs_fonts.h"
+#include "prefs_image_viewer.h"
+#include "prefs_message.h"
+#include "prefs_receive.h"
+#include "prefs_msg_colors.h"
+#include "prefs_quote.h"
 #include "prefs_spelling.h"
-#include "scoring.h"
+#include "prefs_summaries.h"
+#include "prefs_themes.h"
+#include "prefs_other.h"
+#include "prefs_send.h"
+#include "prefs_wrapping.h"
+#include "prefs_compose_writing.h"
 #include "prefs_display_header.h"
 #include "account.h"
 #include "procmsg.h"
 #include "log.h"
 #include "prefs_toolbar.h"
 #include "plugin.h"
-
-#if USE_GPGME
-#  include "rfc2015.h"
+#include "mh_gtk.h"
+#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"
 #endif
@@ -88,6 +107,11 @@ gchar *prog_version;
 gchar *argv0;
 #endif
 
+#ifdef HAVE_STARTUP_NOTIFICATION
+static SnLauncheeContext *sn_context = NULL;
+static SnDisplay *sn_display = NULL;
+#endif
+
 static gint lock_socket = -1;
 static gint lock_socket_tag = 0;
 
@@ -116,10 +140,6 @@ static struct RemoteCmd {
 
 static void parse_cmd_opt(int argc, char *argv[]);
 
-#if USE_GPGME
-static void idle_function_for_gpgme(void);
-#endif /* USE_GPGME */
-
 static gint prohibit_duplicate_launch  (void);
 static gchar * get_crashfile_name      (void);
 static gint lock_socket_remove         (void);
@@ -139,12 +159,7 @@ static void send_queue                     (void);
 static void initial_processing         (FolderItem *item, gpointer data);
 static void quit_signal_handler         (int sig);
 static void install_basic_sighandlers   (void);
-
-#if 0
-/* for gettext */
-_("File `%s' already exists.\n"
-  "Can't create folder.")
-#endif
+static void exit_sylpheed              (MainWindow *mainwin);
 
 #define MAKE_DIR_IF_NOT_EXIST(dir) \
 { \
@@ -163,11 +178,60 @@ _("File `%s' already exists.\n"
 
 static MainWindow *static_mainwindow;
 
+#ifdef HAVE_STARTUP_NOTIFICATION
+static void sn_error_trap_push(SnDisplay *display, Display *xdisplay)
+{
+       gdk_error_trap_push();
+}
+
+static void sn_error_trap_pop(SnDisplay *display, Display *xdisplay)
+{
+       gdk_error_trap_pop();
+}
+
+static void startup_notification_complete(gboolean with_window)
+{
+       Display *xdisplay;
+       GtkWidget *hack = NULL;
+
+       if (with_window) {
+               /* this is needed to make the startup notification leave,
+                * if we have been launched from a menu.
+                * We have to display a window, so let it be very little */
+               hack = gtk_window_new(GTK_WINDOW_POPUP);
+               gtk_widget_set_uposition(hack, 0, 0);
+               gtk_widget_set_size_request(hack, 1, 1);
+               gtk_widget_show(hack);
+       }
+
+       xdisplay = GDK_DISPLAY();
+       sn_display = sn_display_new(xdisplay,
+                               sn_error_trap_push,
+                               sn_error_trap_pop);
+       sn_context = sn_launchee_context_new_from_environment(sn_display,
+                                                DefaultScreen(xdisplay));
+
+       if (sn_context != NULL)
+       {
+               sn_launchee_context_complete(sn_context);
+               sn_launchee_context_unref(sn_context);
+               sn_display_unref(sn_display);
+       }
+}
+#endif /* HAVE_STARTUP_NOTIFICATION */
+
+void sylpheed_gtk_idle(void) 
+{
+       while(gtk_events_pending())
+               gtk_main_iteration();
+}
+
 int main(int argc, char *argv[])
 {
        gchar *userrc;
        MainWindow *mainwin;
        FolderView *folderview;
+       GdkPixbuf *icon;
 
        if (!sylpheed_init(&argc, &argv)) {
                return 0;
@@ -193,7 +257,13 @@ int main(int argc, char *argv[])
 
        /* check and create unix domain socket */
        lock_socket = prohibit_duplicate_launch();
-       if (lock_socket < 0) return 0;
+       if (lock_socket < 0) {
+#ifdef HAVE_STARTUP_NOTIFICATION
+               if(gtk_init_check(&argc, &argv))
+                       startup_notification_complete(TRUE);
+#endif
+               return 0;
+       }
 
        if (cmd.status || cmd.status_full) {
                puts("0 Sylpheed not running.");
@@ -201,6 +271,9 @@ int main(int argc, char *argv[])
                return 0;
        }
 
+       g_thread_init(NULL);
+       /* gdk_threads_init(); */
+
        gtk_set_locale();
        gtk_init(&argc, &argv);
 
@@ -208,31 +281,30 @@ int main(int argc, char *argv[])
        gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
        gtk_widget_set_default_visual(gdk_rgb_get_visual());
 
-#if USE_THREADS || USE_LDAP
-       g_thread_init(NULL);
        if (!g_thread_supported())
                g_error(_("g_thread is not supported by glib.\n"));
-#endif
 
        /* parse gtkrc files */
-       userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc",
+       userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc-2.0",
                             NULL);
        gtk_rc_parse(userrc);
        g_free(userrc);
        userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtk",
-                            G_DIR_SEPARATOR_S, "gtkrc", NULL);
+                            G_DIR_SEPARATOR_S, "gtkrc-2.0", NULL);
        gtk_rc_parse(userrc);
        g_free(userrc);
-       userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "gtkrc", NULL);
+       userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "gtkrc-2.0", NULL);
        gtk_rc_parse(userrc);
        g_free(userrc);
 
-       gtk_rc_parse("./gtkrc");
-
        userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL);
-       gtk_item_factory_parse_rc(userrc);
+       gtk_accel_map_load (userrc);
        g_free(userrc);
 
+       gtk_settings_set_long_property(gtk_settings_get_default(), 
+                                      "gtk-can-change-accels",
+                                      (glong)TRUE, "XProperty");
+
        CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
 
        MAKE_DIR_IF_NOT_EXIST(RC_DIR);
@@ -245,40 +317,31 @@ int main(int argc, char *argv[])
        set_log_file(RC_DIR G_DIR_SEPARATOR_S "sylpheed.log");
 
        folder_system_init();
-       prefs_common_init();
        prefs_common_read_config();
 
-#if USE_GPGME
-       gpg_started = FALSE;
-       if (gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP) != 
-                       GPGME_No_Error) {  /* Also does some gpgme init */
-               rfc2015_disable_all();
-               debug_print("gpgme_engine_version:\n%s\n",
-                           gpgme_get_engine_info());
-
-               if (prefs_common.gpg_warning) {
-                       AlertValue val;
-
-                       val = alertpanel_message_with_disable
-                               (_("Warning"),
-                                _("GnuPG is not installed properly, or needs to be upgraded.\n"
-                                  "OpenPGP support disabled."));
-                       if (val & G_ALERTDISABLE)
-                               prefs_common.gpg_warning = FALSE;
-               }
-       } else
-               gpg_started = TRUE;
-
-       gpgme_register_idle(idle_function_for_gpgme);
-#endif
-
+       prefs_themes_init();
+       prefs_fonts_init();
+       prefs_ext_prog_init();
+       prefs_wrapping_init();
+       prefs_compose_writing_init();
+       prefs_msg_colors_init();
+       image_viewer_init();
+       prefs_image_viewer_init();
+       prefs_quote_init();
+       prefs_summaries_init();
+       prefs_message_init();
+       prefs_other_init();
+       prefs_receive_init();
+       prefs_send_init();
 #ifdef USE_ASPELL
        gtkaspell_checkers_init();
        prefs_spelling_init();
 #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(); */
@@ -286,7 +349,14 @@ 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();
+       imap_gtk_init();
+       news_gtk_init();
+               
        mainwin = main_window_create
                (prefs_common.sep_folder | prefs_common.sep_msg << 1);
        folderview = mainwin->folderview;
@@ -297,26 +367,36 @@ int main(int argc, char *argv[])
                                        lock_socket_input_cb,
                                        mainwin);
 
+       prefs_account_init();
        account_read_config_all();
 
        if (folder_read_list() < 0) {
-               setup(mainwin);
+               if (!run_wizard(mainwin, TRUE))
+                       exit(1);
                folder_write_list();
        }
+
        if (!account_get_list()) {
-               account_edit_open();
-               account_add();
+               if (!run_wizard(mainwin, FALSE))
+                       exit(1);
+               account_read_config_all();
+               if(!account_get_list())
+                       exit_sylpheed(mainwin);
        }
 
+#ifdef HAVE_LIBETPAN
+       imap_main_init();
+#endif 
        account_set_missing_folder();
        folder_set_missing_folders();
        folderview_set(folderview);
 
-       /* prefs_scoring_read_config(); */
        prefs_matcher_read_config();
 
        /* make one all-folder processing before using sylpheed */
+       main_window_cursor_wait(mainwin);
        folder_func_to_all_folders(initial_processing, (gpointer *)mainwin);
+       main_window_cursor_normal(mainwin);
 
        /* if Sylpheed crashed, rebuild caches */
        if (!cmd.crash && is_file_exist(get_crashfile_name())) {
@@ -333,8 +413,38 @@ int main(int argc, char *argv[])
        /* ignore SIGPIPE signal for preventing sudden death of program */
        signal(SIGPIPE, SIG_IGN);
 
-       if (cmd.receive_all || prefs_common.chk_on_startup)
-               inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
+       if (cmd.online_mode == ONLINE_MODE_OFFLINE)
+               main_window_toggle_work_offline(mainwin, TRUE);
+       if (cmd.online_mode == ONLINE_MODE_ONLINE)
+               main_window_toggle_work_offline(mainwin, FALSE);
+
+       if (cmd.status_folders) {
+               g_ptr_array_free(cmd.status_folders, TRUE);
+               cmd.status_folders = NULL;
+       }
+       if (cmd.status_full_folders) {
+               g_ptr_array_free(cmd.status_full_folders, TRUE);
+               cmd.status_full_folders = NULL;
+       }
+
+       sylpheed_register_idle_function(sylpheed_gtk_idle);
+
+       prefs_toolbar_init();
+
+       plugin_load_all("GTK2");
+       
+       static_mainwindow = mainwin;
+
+#ifdef HAVE_STARTUP_NOTIFICATION
+       startup_notification_complete(FALSE);
+#endif
+
+       if (cmd.receive_all)
+               inc_all_account_mail(mainwin, FALSE, 
+                                    prefs_common.newmail_notify_manu);
+       else if (prefs_common.chk_on_startup)
+               inc_all_account_mail(mainwin, TRUE, 
+                                    prefs_common.newmail_notify_manu);
        else if (cmd.receive)
                inc_mail(mainwin, prefs_common.newmail_notify_manu);
        else
@@ -349,40 +459,97 @@ int main(int argc, char *argv[])
        }
        if (cmd.send)
                send_queue();
-       if (cmd.status_folders) {
-               g_ptr_array_free(cmd.status_folders, TRUE);
-               cmd.status_folders = NULL;
-       }
-       if (cmd.status_full_folders) {
-               g_ptr_array_free(cmd.status_full_folders, TRUE);
-               cmd.status_full_folders = NULL;
+       
+       gtk_main();
+
+       exit_sylpheed(mainwin);
+
+       return 0;
+}
+
+static void save_all_caches(FolderItem *item, gpointer data)
+{
+       if (!item->cache)
+               return;
+       folder_item_write_cache(item);
+}
+
+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)
+               main_window_empty_trash(mainwin, prefs_common.ask_on_clean);
+
+       /* save prefs for opened folder */
+       if(mainwin->folderview->opened)
+       {
+               FolderItem *item;
+
+               item = gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->folderview->ctree), mainwin->folderview->opened);
+               summary_save_prefs_to_folderitem(mainwin->folderview->summaryview, item);
        }
 
-       if (cmd.online_mode == ONLINE_MODE_OFFLINE)
-               main_window_toggle_work_offline(mainwin, TRUE);
-       if (cmd.online_mode == ONLINE_MODE_ONLINE)
-               main_window_toggle_work_offline(mainwin, FALSE);
+       /* save all state before exiting */
+       folder_write_list();
+       folder_func_to_all_folders(save_all_caches, NULL);
 
-       prefs_toolbar_init();
+       main_window_get_size(mainwin);
+       main_window_get_position(mainwin);
+       prefs_common_write_config();
+       account_write_config_all();
+       addressbook_export_to_file();
 
-       plugin_load_all("GTK");
-       
-       static_mainwindow = mainwin;
-       gtk_main();
+       filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL);
+       gtk_accel_map_save(filename);
+       g_free(filename);
+
+       /* delete temporary files */
+       remove_all_files(get_tmp_dir());
+       remove_all_files(get_mime_tmp_dir());
+
+       close_log_file();
 
-       plugin_unload_all("GTK");
+       /* delete crashfile */
+       if (!cmd.crash)
+               unlink(get_crashfile_name());
+
+       lock_socket_remove();
+
+       main_window_destroy(mainwin);
+       
+       plugin_unload_all("GTK2");
 
        prefs_toolbar_done();
 
        addressbook_destroy();
 
+       prefs_themes_done();
+       prefs_fonts_done();
+       prefs_ext_prog_done();
+       prefs_wrapping_done();
+       prefs_compose_writing_done();
+       prefs_msg_colors_done();
+       prefs_image_viewer_done();
+       image_viewer_done();
+       prefs_quote_done();
+       prefs_summaries_done();
+       prefs_message_done();
+       prefs_other_done();
+       prefs_receive_done();
+       prefs_send_done();
 #ifdef USE_ASPELL       
        prefs_spelling_done();
        gtkaspell_checkers_quit();
 #endif
        sylpheed_done();
 
-       return 0;
 }
 
 static void parse_cmd_opt(int argc, char *argv[])
@@ -458,26 +625,27 @@ static void parse_cmd_opt(int argc, char *argv[])
                } else if (!strncmp(argv[i], "--offline", 9)) {
                        cmd.online_mode = ONLINE_MODE_OFFLINE;
                } else if (!strncmp(argv[i], "--help", 6)) {
-                       g_print(_("Usage: %s [OPTION]...\n"),
-                               g_basename(argv[0]));
-
-                       puts(_("  --compose [address]    open composition window"));
-                       puts(_("  --attach file1 [file2]...\n"
-                              "                         open composition window with specified files\n"
-                              "                         attached"));
-                       puts(_("  --receive              receive new messages"));
-                       puts(_("  --receive-all          receive new messages of all accounts"));
-                       puts(_("  --send                 send all queued messages"));
-                       puts(_("  --status [folder]...   show the total number of messages"));
-                       puts(_("  --status-full [folder]...\n"
+                       gchar *base = g_path_get_basename(argv[0]);
+                       g_print(_("Usage: %s [OPTION]...\n"), base);
+
+                       g_print("%s\n", _("  --compose [address]    open composition window"));
+                       g_print("%s\n", _("  --attach file1 [file2]...\n"
+                                 "                         open composition window with specified files\n"
+                                 "                         attached"));
+                       g_print("%s\n", _("  --receive              receive new messages"));
+                       g_print("%s\n", _("  --receive-all          receive new messages of all accounts"));
+                       g_print("%s\n", _("  --send                 send all queued messages"));
+                       g_print("%s\n", _("  --status [folder]...   show the total number of messages"));
+                       g_print("%s\n", _("  --status-full [folder]...\n"
                               "                         show the status of each folder"));
-                       puts(_("  --online               switch to online mode"));
-                       puts(_("  --offline              switch to offline mode"));
-                       puts(_("  --debug                debug mode"));
-                       puts(_("  --help                 display this help and exit"));
-                       puts(_("  --version              output version information and exit"));
-                       puts(_("  --config-dir           output configuration directory"));
-
+                       g_print("%s\n", _("  --online               switch to online mode"));
+                       g_print("%s\n", _("  --offline              switch to offline mode"));
+                       g_print("%s\n", _("  --debug                debug mode"));
+                       g_print("%s\n", _("  --help                 display this help and exit"));
+                       g_print("%s\n", _("  --version              output version information and exit"));
+                       g_print("%s\n", _("  --config-dir           output configuration directory"));
+
+                       g_free(base);
                        exit(1);
                } else if (!strncmp(argv[i], "--crash", 7)) {
                        cmd.crash = TRUE;
@@ -507,13 +675,6 @@ static gint get_queued_message_num(void)
        return queue->total_msgs;
 }
 
-static void save_all_caches(FolderItem *item, gpointer data)
-{
-       if (!item->cache)
-               return;
-       folder_item_write_cache(item);
-}
-
 static void initial_processing(FolderItem *item, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
@@ -527,31 +688,32 @@ static void initial_processing(FolderItem *item, gpointer data)
        debug_print("%s\n", buf);
        g_free(buf);
 
-       main_window_cursor_wait(mainwin);
        
-       folder_item_apply_processing(item);
+        if (item->prefs->enable_processing)
+                folder_item_apply_processing(item);
 
        debug_print("done.\n");
        STATUSBAR_POP(mainwin);
-       main_window_cursor_normal(mainwin);
 }
 
 static void draft_all_messages(void)
 {
-       GList *compose_list = compose_get_compose_list();
-       GList *elem = NULL;
+       GList *compose_list = NULL;
        
-       if (compose_list) {
-               for (elem = compose_list; elem != NULL && elem->data != NULL; 
-                    elem = elem->next) {
-                       Compose *c = (Compose*)elem->data;
-                       compose_draft(c);
-               }
+       while ((compose_list = compose_get_compose_list()) != NULL) {
+               Compose *c = (Compose*)compose_list->data;
+               compose_draft(c);
        }       
 }
 
-void clean_quit(void)  
+gboolean clean_quit(gpointer data)
 {
+       static gboolean firstrun = TRUE;
+
+       if (!firstrun)
+               return FALSE;
+       firstrun = FALSE;
+
        /*!< Good idea to have the main window stored in a 
         *   static variable so we can check that variable
         *   to see if we're really allowed to do things
@@ -565,30 +727,22 @@ void clean_quit(void)
         * in the original spawner, and not in a spawned
         * child. */
        if (!static_mainwindow) 
-               return;
+               return FALSE;
                
        draft_all_messages();
 
-       if (prefs_common.warn_queued_on_exit) { 
-               /* disable the popup */ 
-               prefs_common.warn_queued_on_exit = FALSE;       
-               app_will_exit(NULL, static_mainwindow);
-               prefs_common.warn_queued_on_exit = TRUE;
-               prefs_common_save_config();
-       } else {
-               app_will_exit(NULL, static_mainwindow);
-       }
+       exit_sylpheed(static_mainwindow);
        exit(0);
+
+       return FALSE;
 }
 
 void app_will_exit(GtkWidget *widget, gpointer data)
 {
        MainWindow *mainwin = data;
-       gchar *filename;
-       GList *list;
        
        if (compose_get_compose_list()) {
-               gint val = alertpanel(_("Notice"),
+               gint val = alertpanel(_("Really quit?"),
                               _("Composing message exists."),
                               _("Draft them"), _("Discard them"), _("Don't quit"));
                switch (val) {
@@ -606,70 +760,14 @@ void app_will_exit(GtkWidget *widget, gpointer data)
        if (prefs_common.warn_queued_on_exit && get_queued_message_num() > 0) {
                if (alertpanel(_("Queued messages"),
                               _("Some unsent messages are queued. Exit now?"),
-                              _("OK"), _("Cancel"), NULL) != G_ALERTDEFAULT)
+                              GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL)
+                   != G_ALERTDEFAULT)
                        return;
                manage_window_focus_in(mainwin->window, NULL, NULL);
        }
-
-       inc_autocheck_timer_remove();
-
-#if USE_GPGME
-        gpgmegtk_free_passphrase();
-#endif
-
-       if (prefs_common.clean_on_exit)
-               main_window_empty_trash(mainwin, prefs_common.ask_on_clean);
-
-       /* save prefs for opened folder */
-       if(mainwin->folderview->opened)
-       {
-               FolderItem *item;
-
-               item = gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->folderview->ctree), mainwin->folderview->opened);
-               summary_save_prefs_to_folderitem(mainwin->folderview->summaryview, item);
-       }
-
-       /* save all state before exiting */
-       folder_write_list();
-       folder_func_to_all_folders(save_all_caches, NULL);
-       for (list = folder_get_list(); list != NULL; list = g_list_next(list)) {
-               Folder *folder = FOLDER(list->data);
-
-               folder_tree_destroy(folder);
-       }
-
-       main_window_get_size(mainwin);
-       main_window_get_position(mainwin);
-       prefs_common_save_config();
-       account_save_config_all();
-       addressbook_export_to_file();
-
-       filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL);
-       gtk_item_factory_dump_rc(filename, NULL, TRUE);
-       g_free(filename);
-
-       /* delete temporary files */
-       remove_all_files(get_mime_tmp_dir());
-
-       close_log_file();
-
-       /* delete crashfile */
-       if (!cmd.crash)
-               unlink(get_crashfile_name());
-
-       lock_socket_remove();
-
        gtk_main_quit();
 }
 
-#if USE_GPGME
-static void idle_function_for_gpgme(void)
-{
-       while (gtk_events_pending())
-               gtk_main_iteration();
-}
-#endif /* USE_GPGME */
-
 /*
  * CLAWS: want this public so crash dialog can delete the
  * lock file too
@@ -839,7 +937,8 @@ static void lock_socket_input_cb(gpointer data,
        if (!strncmp(buf, "popup", 5)) {
                main_window_popup(mainwin);
        } else if (!strncmp(buf, "receive_all", 11)) {
-               inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
+               inc_all_account_mail(mainwin, FALSE,
+                                    prefs_common.newmail_notify_manu);
        } else if (!strncmp(buf, "receive", 7)) {
                inc_mail(mainwin, prefs_common.newmail_notify_manu);
        } else if (!strncmp(buf, "compose_attach", 14)) {
@@ -897,9 +996,6 @@ static void open_compose_new(const gchar *address, GPtrArray *attach_files)
 static void send_queue(void)
 {
        GList *list;
-       FolderItem *def_outbox;
-
-       def_outbox = folder_get_default_outbox();
 
        for (list = folder_get_list(); list != NULL; list = list->next) {
                Folder *folder = list->data;
@@ -912,10 +1008,6 @@ static void send_queue(void)
                                alertpanel_error(_("Some errors occurred while sending queued messages."));
                        if (res)        
                                folder_item_scan(folder->queue);
-                       if (prefs_common.savemsg && folder->outbox) {
-                               if (folder->outbox == def_outbox)
-                                       def_outbox = NULL;
-                       }
                }
        }
 }
@@ -923,7 +1015,8 @@ static void send_queue(void)
 static void quit_signal_handler(int sig)
 {
        debug_print("Quitting on signal %d\n", sig);
-       clean_quit();
+
+       g_timeout_add(0, clean_quit, NULL);
 }
 
 static void install_basic_sighandlers()
@@ -939,6 +1032,9 @@ static void install_basic_sighandlers()
 #ifdef SIGINT
        sigaddset(&mask, SIGINT);
 #endif
+#ifdef SIGHUP
+       sigaddset(&mask, SIGHUP);
+#endif
 
        act.sa_handler = quit_signal_handler;
        act.sa_mask    = mask;
@@ -950,6 +1046,9 @@ static void install_basic_sighandlers()
 #ifdef SIGINT
        sigaction(SIGINT, &act, 0);
 #endif 
+#ifdef SIGHUP
+       sigaction(SIGHUP, &act, 0);
+#endif 
 
        sigprocmask(SIG_UNBLOCK, &mask, 0);
 }