0.9.6claws32
[claws.git] / src / main.c
index 7a7776d67d82a7e27491681c5e426bda91a56363..272f0aaf942d3c7d6f1b1ff52c6103c82f960627 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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
 #include <gtk/gtkmain.h>
 #include <gtk/gtkrc.h>
 
-#if HAVE_GDK_IMLIB
-#  include <gdk_imlib.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <signal.h>
 
-#if HAVE_LOCALE_H
-#  include <locale.h>
-#endif
-
 #if USE_GPGME
 #  include <gpgme.h>
 #  include "passphrase.h"
 #endif
 
+#include "sylpheed.h"
 #include "intl.h"
 #include "main.h"
 #include "mainwindow.h"
@@ -58,6 +51,8 @@
 #include "prefs_common.h"
 #include "prefs_account.h"
 #include "prefs_actions.h"
+#include "prefs_fonts.h"
+#include "prefs_spelling.h"
 #include "scoring.h"
 #include "prefs_display_header.h"
 #include "account.h"
 #include "setup.h"
 #include "utils.h"
 #include "gtkutils.h"
+#include "socket.h"
 #include "log.h"
+#include "prefs_toolbar.h"
+#include "plugin.h"
 
 #if USE_GPGME
-#  include "rfc2015.h"
+#  include "sgpgme.h"
+#  include "pgpmime.h"
 #endif
-#if USE_SSL
+#if USE_OPENSSL
 #  include "ssl.h"
 #endif
 
@@ -87,8 +86,9 @@
 #include "crash.h"
 
 gchar *prog_version;
-gchar *startup_dir;
+#ifdef CRASH_DIALOG
 gchar *argv0;
+#endif
 
 static gint lock_socket = -1;
 static gint lock_socket_tag = 0;
@@ -100,14 +100,16 @@ typedef enum
        ONLINE_MODE_OFFLINE
 } OnlineMode;
 
-
-static struct Cmd {
+static struct RemoteCmd {
        gboolean receive;
        gboolean receive_all;
        gboolean compose;
        const gchar *compose_mailto;
        GPtrArray *attach_files;
        gboolean status;
+       gboolean status_full;
+       GPtrArray *status_folders;
+       GPtrArray *status_full_folders;
        gboolean send;
        gboolean crash;
        int online_mode;
@@ -116,12 +118,9 @@ static struct Cmd {
 
 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);
 static void lock_socket_input_cb       (gpointer          data,
                                         gint              source,
                                         GdkInputCondition condition);
@@ -136,6 +135,8 @@ static void open_compose_new                (const gchar    *address,
 
 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 */
@@ -159,41 +160,51 @@ _("File `%s' already exists.\n"
 }
 
 static MainWindow *static_mainwindow;
+
 int main(int argc, char *argv[])
 {
        gchar *userrc;
        MainWindow *mainwin;
        FolderView *folderview;
 
-       setlocale(LC_ALL, "");
-       bindtextdomain(PACKAGE, LOCALEDIR);
-       textdomain(PACKAGE);
+       if (!sylpheed_init(&argc, &argv)) {
+               return 0;
+       }
 
        prog_version = PROG_VERSION;
-       startup_dir = g_get_current_dir();
+#ifdef CRASH_DIALOG
        argv0 = g_strdup(argv[0]);
+#endif
 
        parse_cmd_opt(argc, argv);
 
+#ifdef CRASH_DIALOG
+       if (cmd.crash) {
+               gtk_set_locale();
+               gtk_init(&argc, &argv);
+               crash_main(cmd.crash_params);
+               return 0;
+       }
+       crash_install_handlers();
+#endif
+       install_basic_sighandlers();
+
        /* check and create unix domain socket */
        lock_socket = prohibit_duplicate_launch();
        if (lock_socket < 0) return 0;
 
-       if (cmd.status) {
+       if (cmd.status || cmd.status_full) {
                puts("0 Sylpheed not running.");
+               lock_socket_remove();
                return 0;
        }
 
        gtk_set_locale();
        gtk_init(&argc, &argv);
 
-#ifdef CRASH_DIALOG
-       if (cmd.crash) {
-               crash_main(cmd.crash_params);
-               return 0;
-       }
-       crash_install_handlers();
-#endif
+       gdk_rgb_init();
+       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);
@@ -201,18 +212,6 @@ int main(int argc, char *argv[])
                g_error(_("g_thread is not supported by glib.\n"));
 #endif
 
-#if HAVE_GDK_IMLIB
-       gdk_imlib_init();
-       gtk_widget_push_visual(gdk_imlib_get_visual());
-       gtk_widget_push_colormap(gdk_imlib_get_colormap());
-#endif
-
-#if USE_SSL
-       ssl_init();
-#endif
-
-       srandom((gint)time(NULL));
-
        /* parse gtkrc files */
        userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc",
                             NULL);
@@ -234,11 +233,6 @@ int main(int argc, char *argv[])
 
        CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
 
-       /* backup if old rc file exists */
-       if (is_file_exist(RC_DIR)) {
-               if (rename(RC_DIR, RC_DIR ".bak") < 0)
-                       FILE_OP_ERROR(RC_DIR, "rename");
-       }
        MAKE_DIR_IF_NOT_EXIST(RC_DIR);
        MAKE_DIR_IF_NOT_EXIST(get_imap_cache_dir());
        MAKE_DIR_IF_NOT_EXIST(get_news_cache_dir());
@@ -246,50 +240,27 @@ int main(int argc, char *argv[])
        MAKE_DIR_IF_NOT_EXIST(get_tmp_dir());
        MAKE_DIR_IF_NOT_EXIST(RC_DIR G_DIR_SEPARATOR_S "uidl");
 
-       if (is_file_exist(RC_DIR G_DIR_SEPARATOR_S "sylpheed.log")) {
-               if (rename(RC_DIR G_DIR_SEPARATOR_S "sylpheed.log",
-                          RC_DIR G_DIR_SEPARATOR_S "sylpheed.log.bak") < 0)
-                       FILE_OP_ERROR("sylpheed.log", "rename");
-       }
        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);
+       sgpgme_init();
+       pgpmime_init();
 #endif
 
-#if USE_ASPELL
-       gtkaspellcheckers = gtkaspell_checkers_new();
+       prefs_fonts_init();
+#ifdef USE_ASPELL
+       gtkaspell_checkers_init();
+       prefs_spelling_init();
 #endif
        
+       sock_set_io_timeout(prefs_common.io_timeout_secs);
 
-       prefs_common_save_config();
        prefs_actions_read_config();
-       prefs_actions_write_config();
        prefs_display_header_read_config();
-       prefs_display_header_write_config();
        /* prefs_filtering_read_config(); */
        addressbook_read_file();
        renderer_read_config();
@@ -307,7 +278,6 @@ int main(int argc, char *argv[])
                                        mainwin);
 
        account_read_config_all();
-       account_save_config_all();
 
        if (folder_read_list() < 0) {
                setup(mainwin);
@@ -343,8 +313,12 @@ 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.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
@@ -359,20 +333,44 @@ 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;
+       }
 
        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);
+
+       prefs_toolbar_init();
+
+       plugin_load_all("GTK");
        
        static_mainwindow = mainwin;
        gtk_main();
 
+       plugin_unload_all("GTK");
+
+       prefs_toolbar_done();
+
        addressbook_destroy();
 
-#if USE_ASPELL       
-       gtkaspell_checkers_delete();
+#ifdef USE_GPGME
+       pgpmime_done();
+       sgpgme_done();
+#endif
+
+       prefs_fonts_done();
+#ifdef USE_ASPELL       
+       prefs_spelling_done();
+       gtkaspell_checkers_quit();
 #endif
+       sylpheed_done();
 
        return 0;
 }
@@ -382,9 +380,7 @@ static void parse_cmd_opt(int argc, char *argv[])
        gint i;
 
        for (i = 1; i < argc; i++) {
-               if (!strncmp(argv[i], "--debug", 7))
-                       debug_set_mode(TRUE);
-               else if (!strncmp(argv[i], "--receive-all", 13))
+               if (!strncmp(argv[i], "--receive-all", 13))
                        cmd.receive_all = TRUE;
                else if (!strncmp(argv[i], "--receive", 9))
                        cmd.receive = TRUE;
@@ -408,7 +404,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                                if (!cmd.attach_files)
                                        cmd.attach_files = g_ptr_array_new();
                                if (*p != G_DIR_SEPARATOR)
-                                       file = g_strconcat(startup_dir,
+                                       file = g_strconcat(sylpheed_get_startup_dir(),
                                                           G_DIR_SEPARATOR_S,
                                                           p, NULL);
                                else
@@ -422,8 +418,31 @@ static void parse_cmd_opt(int argc, char *argv[])
                } else if (!strncmp(argv[i], "--version", 9)) {
                        puts("Sylpheed version " VERSION);
                        exit(0);
-               } else if (!strncmp(argv[i], "--status", 8)) {
-                       cmd.status = TRUE;
+               } else if (!strncmp(argv[i], "--status-full", 13)) {
+                       const gchar *p = argv[i + 1];
+                       cmd.status_full = TRUE;
+                       while (p && *p != '\0' && *p != '-') {
+                               if (!cmd.status_full_folders)
+                                       cmd.status_full_folders =
+                                               g_ptr_array_new();
+                               g_ptr_array_add(cmd.status_full_folders,
+                                               g_strdup(p));
+                               i++;
+                               p = argv[i + 1];
+                       }
+               } else if (!strncmp(argv[i], "--status", 8)) {
+                       const gchar *p = argv[i + 1];
+                       cmd.status = TRUE;
+                       while (p && *p != '\0' && *p != '-') {
+                               if (!cmd.status_folders)
+                                       cmd.status_folders = g_ptr_array_new();
+                               g_ptr_array_add(cmd.status_folders,
+                                               g_strdup(p));
+                               i++;
+                               p = argv[i + 1];
+                       }
                } else if (!strncmp(argv[i], "--online", 8)) {
                        cmd.online_mode = ONLINE_MODE_ONLINE;
                } else if (!strncmp(argv[i], "--offline", 9)) {
@@ -439,18 +458,24 @@ static void parse_cmd_opt(int argc, char *argv[])
                        puts(_("  --receive              receive new messages"));
                        puts(_("  --receive-all          receive new messages of all accounts"));
                        puts(_("  --send                 send all queued messages"));
-                       puts(_("  --status               show the total number of messages"));
+                       puts(_("  --status [folder]...   show the total number of messages"));
+                       puts(_("  --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"));
 
                        exit(1);
                } else if (!strncmp(argv[i], "--crash", 7)) {
                        cmd.crash = TRUE;
                        cmd.crash_params = g_strdup(argv[i + 1]);
                        i++;
+               } else if (!strncmp(argv[i], "--config-dir", sizeof "--config-dir" - 1)) {
+                       puts(RC_DIR);
+                       exit(0);
                }
                
        }
@@ -469,7 +494,7 @@ static gint get_queued_message_num(void)
        if (!queue) return -1;
 
        folder_item_scan(queue);
-       return queue->total;
+       return queue->total_msgs;
 }
 
 static void save_all_caches(FolderItem *item, gpointer data)
@@ -503,10 +528,12 @@ static void initial_processing(FolderItem *item, gpointer data)
 
 static void draft_all_messages(void)
 {
-       GList * compose_list = compose_get_compose_list();
-       GList * elem = NULL;
-       if(compose_list) {
-               for (elem = compose_list; elem != NULL && elem->data != NULL; elem = elem->next) {
+       GList *compose_list = compose_get_compose_list();
+       GList *elem = NULL;
+       
+       if (compose_list) {
+               for (elem = compose_list; elem != NULL && elem->data != NULL; 
+                    elem = elem->next) {
                        Compose *c = (Compose*)elem->data;
                        compose_draft(c);
                }
@@ -515,10 +542,25 @@ static void draft_all_messages(void)
 
 void clean_quit(void)  
 {
+       /*!< 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
+        *   that actually the spawner is supposed to 
+        *   do (like: sending mail, composing messages).
+        *   Because, really, if we're the spawnee, and
+        *   we touch GTK stuff, we're hosed. See the 
+        *   next fixme. */
+
+       /* FIXME: Use something else to signal that we're
+        * in the original spawner, and not in a spawned
+        * child. */
+       if (!static_mainwindow) 
+               return;
+               
        draft_all_messages();
 
-       if (prefs_common.warn_queued_on_exit)
-       {       /* disable the popup */ 
+       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;
@@ -533,6 +575,7 @@ void app_will_exit(GtkWidget *widget, gpointer data)
 {
        MainWindow *mainwin = data;
        gchar *filename;
+       GList *list;
        
        if (compose_get_compose_list()) {
                gint val = alertpanel(_("Notice"),
@@ -560,10 +603,6 @@ void app_will_exit(GtkWidget *widget, gpointer data)
 
        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);
 
@@ -579,6 +618,11 @@ void app_will_exit(GtkWidget *widget, gpointer data)
        /* 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);
@@ -595,31 +639,15 @@ void app_will_exit(GtkWidget *widget, gpointer data)
 
        close_log_file();
 
-       /* delete unix domain socket */
-       gdk_input_remove(lock_socket_tag);
-       fd_close(lock_socket);
-       filename = get_socket_name();
-       unlink(filename);
-       
        /* delete crashfile */
        if (!cmd.crash)
                unlink(get_crashfile_name());
 
-#if USE_SSL
-       ssl_done();
-#endif
+       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
@@ -669,9 +697,9 @@ static gint prohibit_duplicate_launch(void)
        debug_print("another Sylpheed is already running.\n");
 
        if (cmd.receive_all)
-               fd_write(uxsock, "receive_all\n", 12);
+               fd_write_all(uxsock, "receive_all\n", 12);
        else if (cmd.receive)
-               fd_write(uxsock, "receive\n", 8);
+               fd_write_all(uxsock, "receive\n", 8);
        else if (cmd.compose && cmd.attach_files) {
                gchar *str, *compose_str;
                gint i;
@@ -682,45 +710,99 @@ static gint prohibit_duplicate_launch(void)
                else
                        compose_str = g_strdup("compose_attach\n");
 
-               fd_write(uxsock, compose_str, strlen(compose_str));
+               fd_write_all(uxsock, compose_str, strlen(compose_str));
                g_free(compose_str);
 
                for (i = 0; i < cmd.attach_files->len; i++) {
                        str = g_ptr_array_index(cmd.attach_files, i);
-                       fd_write(uxsock, str, strlen(str));
-                       fd_write(uxsock, "\n", 1);
+                       fd_write_all(uxsock, str, strlen(str));
+                       fd_write_all(uxsock, "\n", 1);
                }
 
-               fd_write(uxsock, ".\n", 2);
+               fd_write_all(uxsock, ".\n", 2);
        } else if (cmd.compose) {
                gchar *compose_str;
 
                if (cmd.compose_mailto)
-                       compose_str = g_strdup_printf("compose %s\n", cmd.compose_mailto);
+                       compose_str = g_strdup_printf
+                               ("compose %s\n", cmd.compose_mailto);
                else
                        compose_str = g_strdup("compose\n");
 
-               fd_write(uxsock, compose_str, strlen(compose_str));
+               fd_write_all(uxsock, compose_str, strlen(compose_str));
                g_free(compose_str);
        } else if (cmd.send) {
-               fd_write(uxsock, "send\n", 5);
+               fd_write_all(uxsock, "send\n", 5);
        } else if (cmd.online_mode == ONLINE_MODE_ONLINE) {
                fd_write(uxsock, "online\n", 6);
        } else if (cmd.online_mode == ONLINE_MODE_OFFLINE) {
                fd_write(uxsock, "offline\n", 7);
-       } else if (cmd.status) {
-               gchar buf[BUFFSIZE];
-
-               fd_write(uxsock, "status\n", 7);
-               fd_gets(uxsock, buf, sizeof(buf));
-               fputs(buf, stdout);
+       } else if (cmd.status || cmd.status_full) {
+               gchar buf[BUFFSIZE];
+               gint i;
+               const gchar *command;
+               GPtrArray *folders;
+               gchar *folder;
+               command = cmd.status_full ? "status-full\n" : "status\n";
+               folders = cmd.status_full ? cmd.status_full_folders :
+                       cmd.status_folders;
+               fd_write_all(uxsock, command, strlen(command));
+               for (i = 0; folders && i < folders->len; ++i) {
+                       folder = g_ptr_array_index(folders, i);
+                       fd_write_all(uxsock, folder, strlen(folder));
+                       fd_write_all(uxsock, "\n", 1);
+               }
+               fd_write_all(uxsock, ".\n", 2);
+               for (;;) {
+                       fd_gets(uxsock, buf, sizeof(buf));
+                       if (!strncmp(buf, ".\n", 2)) break;
+                       fputs(buf, stdout);
+               }
        } else
-               fd_write(uxsock, "popup\n", 6);
+               fd_write_all(uxsock, "popup\n", 6);
 
        fd_close(uxsock);
        return -1;
 }
 
+static gint lock_socket_remove(void)
+{
+       gchar *filename;
+
+       if (lock_socket < 0) return -1;
+
+       if (lock_socket_tag > 0)
+               gdk_input_remove(lock_socket_tag);
+       fd_close(lock_socket);
+       filename = get_socket_name();
+       unlink(filename);
+
+       return 0;
+}
+
+static GPtrArray *get_folder_item_list(gint sock)
+{
+       gchar buf[BUFFSIZE];
+       FolderItem *item;
+       GPtrArray *folders = NULL;
+
+       for (;;) {
+               fd_gets(sock, buf, sizeof(buf));
+               if (!strncmp(buf, ".\n", 2)) break;
+               strretchomp(buf);
+               if (!folders) folders = g_ptr_array_new();
+               item = folder_find_item_from_identifier(buf);
+               if (item)
+                       g_ptr_array_add(folders, item);
+               else
+                       g_warning("no such folder: %s\n", buf);
+       }
+
+       return folders;
+}
+
 static void lock_socket_input_cb(gpointer data,
                                 gint source,
                                 GdkInputCondition condition)
@@ -735,10 +817,9 @@ static void lock_socket_input_cb(gpointer data,
        if (!strncmp(buf, "popup", 5)) {
                main_window_popup(mainwin);
        } else if (!strncmp(buf, "receive_all", 11)) {
-               main_window_popup(mainwin);
-               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)) {
-               main_window_popup(mainwin);
                inc_mail(mainwin, prefs_common.newmail_notify_manu);
        } else if (!strncmp(buf, "compose_attach", 14)) {
                GPtrArray *files;
@@ -763,12 +844,18 @@ static void lock_socket_input_cb(gpointer data,
                main_window_toggle_work_offline(mainwin, FALSE);
        } else if (!strncmp(buf, "offline", 7)) {
                main_window_toggle_work_offline(mainwin, TRUE);
-       } else if (!strncmp(buf, "status", 6)) {
-               guint new, unread, unreadmarked, total;
-
-               folder_count_total_msgs(&new, &unread, &unreadmarked, &total);
-               g_snprintf(buf, sizeof(buf), "%d %d %d %d\n", new, unread, unreadmarked, total);
-               fd_write(sock, buf, strlen(buf));
+       } else if (!strncmp(buf, "status-full", 11) ||
+                  !strncmp(buf, "status", 6)) {
+               gchar *status;
+               GPtrArray *folders;
+               folders = get_folder_item_list(sock);
+               status = folder_get_status
+                       (folders, !strncmp(buf, "status-full", 11));
+               fd_write_all(sock, status, strlen(status));
+               fd_write_all(sock, ".\n", 2);
+               g_free(status);
+               if (folders) g_ptr_array_free(folders, TRUE);
        }
 
        fd_close(sock);
@@ -797,19 +884,51 @@ static void send_queue(void)
                Folder *folder = list->data;
 
                if (folder->queue) {
-                       if (procmsg_send_queue
-                               (folder->queue, prefs_common.savemsg) < 0)
+                       gint res = procmsg_send_queue
+                               (folder->queue, prefs_common.savemsg);
+
+                       if (res < 0)    
                                alertpanel_error(_("Some errors occurred while sending queued messages."));
-                       statusbar_pop_all();
-                       folder_item_scan(folder->queue);
+                       if (res)        
+                               folder_item_scan(folder->queue);
                        if (prefs_common.savemsg && folder->outbox) {
-                               folder_update_item(folder->outbox, TRUE);
                                if (folder->outbox == def_outbox)
                                        def_outbox = NULL;
                        }
                }
        }
+}
+
+static void quit_signal_handler(int sig)
+{
+       debug_print("Quitting on signal %d\n", sig);
+       clean_quit();
+}
+
+static void install_basic_sighandlers()
+{
+       sigset_t    mask;
+       struct sigaction act;
+
+       sigemptyset(&mask);
+
+#ifdef SIGTERM
+       sigaddset(&mask, SIGTERM);
+#endif
+#ifdef SIGINT
+       sigaddset(&mask, SIGINT);
+#endif
+
+       act.sa_handler = quit_signal_handler;
+       act.sa_mask    = mask;
+       act.sa_flags   = 0;
+
+#ifdef SIGTERM
+       sigaction(SIGTERM, &act, 0);
+#endif
+#ifdef SIGINT
+       sigaction(SIGINT, &act, 0);
+#endif 
 
-       if (prefs_common.savemsg && def_outbox)
-               folder_update_item(def_outbox, TRUE);
+       sigprocmask(SIG_UNBLOCK, &mask, 0);
 }