0.8.10claws50
[claws.git] / src / main.c
index c153022e0243717d54b8a984517d0dd33078ce36..995905876e4d56de9df56cc6d2c404522228bf23 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 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 <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"
 #include "folderview.h"
 #include "summaryview.h"
 #include "prefs_common.h"
-#include "prefs_filter.h"
 #include "prefs_account.h"
+#include "prefs_actions.h"
+#include "scoring.h"
+#include "prefs_display_header.h"
 #include "account.h"
 #include "procmsg.h"
 #include "inc.h"
 #include "import.h"
 #include "manage_window.h"
 #include "alertpanel.h"
+#include "statusbar.h"
 #include "addressbook.h"
 #include "compose.h"
 #include "folder.h"
 #include "setup.h"
 #include "utils.h"
 #include "gtkutils.h"
+#include "log.h"
+#include "prefs_toolbar.h"
+
+#if USE_GPGME
+#  include "rfc2015.h"
+#endif
+#if USE_OPENSSL
+#  include "ssl.h"
+#endif
+
+#include "version.h"
+
+#include "crash.h"
 
 gchar *prog_version;
 gchar *startup_dir;
-gboolean debug_mode = FALSE;
+#ifdef CRASH_DIALOG
+gchar *argv0;
+#endif
 
 static gint lock_socket = -1;
 static gint lock_socket_tag = 0;
 
+typedef enum 
+{
+       ONLINE_MODE_DONT_CHANGE,
+       ONLINE_MODE_ONLINE,
+       ONLINE_MODE_OFFLINE
+} OnlineMode;
+
+
 static struct Cmd {
        gboolean receive;
        gboolean receive_all;
        gboolean compose;
        const gchar *compose_mailto;
+       GPtrArray *attach_files;
+       gboolean status;
+       gboolean send;
+       gboolean crash;
+       int online_mode;
+       gchar   *crash_params;
 } cmd;
 
 static void parse_cmd_opt(int argc, char *argv[]);
@@ -91,12 +121,21 @@ static void idle_function_for_gpgme(void);
 #endif /* USE_GPGME */
 
 static gint prohibit_duplicate_launch  (void);
+static gchar * get_crashfile_name      (void);
 static void lock_socket_input_cb       (gpointer          data,
                                         gint              source,
                                         GdkInputCondition condition);
-static gchar *get_socket_name          (void);
+#ifndef CLAWS                                   
+static 
+#endif
+gchar *get_socket_name         (void);
+
 
-static void open_compose_new_with_recipient    (const gchar    *address);
+static void open_compose_new           (const gchar    *address,
+                                        GPtrArray      *attach_files);
+
+static void send_queue                 (void);
+static void initial_processing         (FolderItem *item, gpointer data);
 
 #if 0
 /* for gettext */
@@ -114,29 +153,53 @@ _("File `%s' already exists.\n"
                                 dir); \
                        return 1; \
                } \
-               if (mkdir(dir, S_IRWXU) < 0) { \
-                       FILE_OP_ERROR(dir, "mkdir"); \
+               if (make_dir(dir) < 0) \
                        return 1; \
-               } \
-               if (chmod(dir, S_IRWXU) < 0) \
-                       FILE_OP_ERROR(dir, "chmod"); \
        } \
 }
 
+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
+
+       /* check and create unix domain socket */
+       lock_socket = prohibit_duplicate_launch();
+       if (lock_socket < 0) return 0;
+
+       if (cmd.status) {
+               puts("0 Sylpheed not running.");
+               return 0;
+       }
 
        gtk_set_locale();
        gtk_init(&argc, &argv);
 
-#if USE_THREADS
+#if USE_THREADS || USE_LDAP
        g_thread_init(NULL);
        if (!g_thread_supported())
                g_error(_("g_thread is not supported by glib.\n"));
@@ -167,54 +230,57 @@ int main(int argc, char *argv[])
        gtk_item_factory_parse_rc(userrc);
        g_free(userrc);
 
-       prog_version = PROG_VERSION;
-       startup_dir = g_get_current_dir();
-
-       parse_cmd_opt(argc, argv);
-
        CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
 
-       /* check and create unix domain socket */
-       lock_socket = prohibit_duplicate_launch();
-       if (lock_socket < 0) return 0;
-    
-       /* 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());
        MAKE_DIR_IF_NOT_EXIST(get_mime_tmp_dir());
+       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 "assortrc") &&
-           !is_file_exist(RC_DIR G_DIR_SEPARATOR_S "filterrc")) {
-               if (rename(RC_DIR G_DIR_SEPARATOR_S "assortrc",
-                          RC_DIR G_DIR_SEPARATOR_S "filterrc") < 0)
-                       FILE_OP_ERROR(RC_DIR G_DIR_SEPARATOR_S "assortrc",
-                                     "rename");
-       }
+       set_log_file(RC_DIR G_DIR_SEPARATOR_S "sylpheed.log");
 
-       srandom((gint)time(NULL));
+       prefs_common_init();
+       prefs_common_read_config();
 
 #if USE_GPGME
-       if (gpgme_check_engine()) {  /* Also does some gpgme init */
+       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());
-               alertpanel_warning(_("GnuPG is not installed properly.\n"
-                                    "OpenPGP support disabled."));
-       }
+
+               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_common_read_config();
+#if USE_ASPELL
+       gtkaspellcheckers = gtkaspell_checkers_new();
+#endif
+       
+
        prefs_common_save_config();
-       prefs_filter_read_config();
-       prefs_filter_write_config();
-       prefs_display_headers_read_config();
-       prefs_display_headers_write_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();
 
        gtkut_widget_init();
 
@@ -231,25 +297,76 @@ int main(int argc, char *argv[])
        account_read_config_all();
        account_save_config_all();
 
-       if (folder_read_list() < 0) setup(mainwin);
+       if (folder_read_list() < 0) {
+               setup(mainwin);
+               folder_write_list();
+       }
+       if (!account_get_list()) {
+               account_edit_open();
+               account_add();
+       }
+
        account_set_missing_folder();
+       folder_set_missing_folders();
        folderview_set(folderview);
 
-       if (cmd.receive_all)
-               inc_all_account_mail(mainwin);
-       else if (prefs_common.chk_on_startup || cmd.receive)
-               inc_mail(mainwin);
+       /* prefs_scoring_read_config(); */
+       prefs_matcher_read_config();
+
+       /* make one all-folder processing before using sylpheed */
+       folder_func_to_all_folders(initial_processing, (gpointer *)mainwin);
+
+       /* if Sylpheed crashed, rebuild caches */
+       if (!cmd.crash && is_file_exist(get_crashfile_name())) {
+               debug_print("Sylpheed crashed, checking for new messages in local folders\n");
+               folderview_check_new(NULL);
+       }
+       /* make the crash-indicator file */
+       str_write_to_file("foo", get_crashfile_name());
+
+       addressbook_read_file();
+
+       inc_autocheck_timer_init(mainwin);
+
+       /* 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);
+       else if (cmd.receive)
+               inc_mail(mainwin, prefs_common.newmail_notify_manu);
        else
                gtk_widget_grab_focus(folderview->ctree);
 
        if (cmd.compose)
-               open_compose_new_with_recipient(cmd.compose_mailto);
+               open_compose_new(cmd.compose_mailto, cmd.attach_files);
+       if (cmd.attach_files) {
+               ptr_array_free_strings(cmd.attach_files);
+               g_ptr_array_free(cmd.attach_files, TRUE);
+               cmd.attach_files = NULL;
+       }
+       if (cmd.send)
+               send_queue();
 
-       /* ignore SIGPIPE signal for preventing sudden death of program */
-       signal(SIGPIPE, SIG_IGN);
+       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();
+       
+       static_mainwindow = mainwin;
        gtk_main();
 
+       prefs_toolbar_done();
+
+       addressbook_destroy();
+
+#if USE_ASPELL       
+       gtkaspell_checkers_delete();
+#endif
+       sylpheed_done();
+
        return 0;
 }
 
@@ -258,9 +375,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_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;
@@ -276,21 +391,64 @@ static void parse_cmd_opt(int argc, char *argv[])
                                        cmd.compose_mailto = p;
                                i++;
                        }
+               } else if (!strncmp(argv[i], "--attach", 8)) {
+                       const gchar *p = argv[i + 1];
+                       gchar *file;
+
+                       while (p && *p != '\0' && *p != '-') {
+                               if (!cmd.attach_files)
+                                       cmd.attach_files = g_ptr_array_new();
+                               if (*p != G_DIR_SEPARATOR)
+                                       file = g_strconcat(startup_dir,
+                                                          G_DIR_SEPARATOR_S,
+                                                          p, NULL);
+                               else
+                                       file = g_strdup(p);
+                               g_ptr_array_add(cmd.attach_files, file);
+                               i++;
+                               p = argv[i + 1];
+                       }
+               } else if (!strncmp(argv[i], "--send", 6)) {
+                       cmd.send = TRUE;
                } 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], "--online", 8)) {
+                       cmd.online_mode = ONLINE_MODE_ONLINE;
+               } 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_get_prgname());
+                       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               show the total number of messages"));
+                       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"));
 
                        exit(1);
+               } else if (!strncmp(argv[i], "--crash", 7)) {
+                       cmd.crash = TRUE;
+                       cmd.crash_params = g_strdup(argv[i + 1]);
+                       i++;
                }
+               
+       }
+
+       if (cmd.attach_files && cmd.compose == FALSE) {
+               cmd.compose = TRUE;
+               cmd.compose_mailto = NULL;
        }
 }
 
@@ -299,22 +457,87 @@ static gint get_queued_message_num(void)
        FolderItem *queue;
 
        queue = folder_get_default_queue();
-       g_return_val_if_fail(queue != NULL, -1);
+       if (!queue) return -1;
 
        folder_item_scan(queue);
        return queue->total;
 }
 
+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;
+       gchar *buf;
+
+       g_return_if_fail(item);
+       buf = g_strdup_printf(_("Processing (%s)..."), 
+                             item->path 
+                             ? item->path 
+                             : _("top level folder"));
+       debug_print("%s\n", buf);
+       g_free(buf);
+
+       main_window_cursor_wait(mainwin);
+       
+       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;
+       if(compose_list) {
+               for (elem = compose_list; elem != NULL && elem->data != NULL; elem = elem->next) {
+                       Compose *c = (Compose*)elem->data;
+                       compose_draft(c);
+               }
+       }       
+}
+
+void clean_quit(void)  
+{
+       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(0);
+}
+
 void app_will_exit(GtkWidget *widget, gpointer data)
 {
        MainWindow *mainwin = data;
        gchar *filename;
-
+       
        if (compose_get_compose_list()) {
-               if (alertpanel(_("Notice"),
-                              _("Composing message exists. Really quit?"),
-                              _("OK"), _("Cancel"), NULL) != G_ALERTDEFAULT)
-                       return;
+               gint val = alertpanel(_("Notice"),
+                              _("Composing message exists."),
+                              _("Draft them"), _("Discard them"), _("Don't quit"));
+               switch (val) {
+                       case G_ALERTOTHER:
+                               return;
+                       case G_ALERTALTERNATE:
+                               break;
+                       default:
+                               draft_all_messages();
+               }
+               
                manage_window_focus_in(mainwin->window, NULL, NULL);
        }
 
@@ -326,17 +549,31 @@ void app_will_exit(GtkWidget *widget, gpointer data)
                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();
-       summary_write_cache(mainwin->summaryview);
+       folder_func_to_all_folders(save_all_caches, NULL);
 
        main_window_get_size(mainwin);
        main_window_get_position(mainwin);
        prefs_common_save_config();
-       prefs_filter_write_config();
        account_save_config_all();
        addressbook_export_to_file();
 
@@ -347,11 +584,17 @@ void app_will_exit(GtkWidget *widget, gpointer data)
        /* delete temporary files */
        remove_all_files(get_mime_tmp_dir());
 
+       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());
 
        gtk_main_quit();
 }
@@ -364,7 +607,14 @@ static void idle_function_for_gpgme(void)
 }
 #endif /* USE_GPGME */
 
-static gchar *get_socket_name(void)
+/*
+ * CLAWS: want this public so crash dialog can delete the
+ * lock file too
+ */
+#ifndef CLAWS
+static
+#endif
+gchar *get_socket_name(void)
 {
        static gchar *filename = NULL;
 
@@ -377,6 +627,18 @@ static gchar *get_socket_name(void)
        return filename;
 }
 
+static gchar *get_crashfile_name(void)
+{
+       static gchar *filename = NULL;
+
+       if (filename == NULL) {
+               filename = g_strdup_printf("%s%csylpheed-crashed",
+                                          get_tmp_dir(), G_DIR_SEPARATOR);
+       }
+
+       return filename;
+}
+
 static gint prohibit_duplicate_launch(void)
 {
        gint uxsock;
@@ -391,13 +653,33 @@ static gint prohibit_duplicate_launch(void)
 
        /* remote command mode */
 
-       debug_print(_("another Sylpheed is already running.\n"));
+       debug_print("another Sylpheed is already running.\n");
 
        if (cmd.receive_all)
                fd_write(uxsock, "receive_all\n", 12);
        else if (cmd.receive)
                fd_write(uxsock, "receive\n", 8);
-       else if (cmd.compose) {
+       else if (cmd.compose && cmd.attach_files) {
+               gchar *str, *compose_str;
+               gint i;
+
+               if (cmd.compose_mailto)
+                       compose_str = g_strdup_printf("compose_attach %s\n",
+                                                     cmd.compose_mailto);
+               else
+                       compose_str = g_strdup("compose_attach\n");
+
+               fd_write(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(uxsock, ".\n", 2);
+       } else if (cmd.compose) {
                gchar *compose_str;
 
                if (cmd.compose_mailto)
@@ -407,6 +689,18 @@ static gint prohibit_duplicate_launch(void)
 
                fd_write(uxsock, compose_str, strlen(compose_str));
                g_free(compose_str);
+       } else if (cmd.send) {
+               fd_write(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
                fd_write(uxsock, "popup\n", 6);
 
@@ -423,23 +717,51 @@ static void lock_socket_input_cb(gpointer data,
        gchar buf[BUFFSIZE];
 
        sock = fd_accept(source);
-       fd_read(sock, buf, sizeof(buf));
-       fd_close(sock);
+       fd_gets(sock, buf, sizeof(buf));
 
-       if (!strncmp(buf, "popup", 5)){
+       if (!strncmp(buf, "popup", 5)) {
                main_window_popup(mainwin);
-       } else if (!strncmp(buf, "receive_all", 11)){
+       } else if (!strncmp(buf, "receive_all", 11)) {
                main_window_popup(mainwin);
-               inc_all_account_mail(mainwin);
-       } else if (!strncmp(buf, "receive", 7)){
+               inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
+       } else if (!strncmp(buf, "receive", 7)) {
                main_window_popup(mainwin);
-               inc_mail(mainwin);
+               inc_mail(mainwin, prefs_common.newmail_notify_manu);
+       } else if (!strncmp(buf, "compose_attach", 14)) {
+               GPtrArray *files;
+               gchar *mailto;
+
+               mailto = g_strdup(buf + strlen("compose_attach") + 1);
+               files = g_ptr_array_new();
+               while (fd_gets(sock, buf, sizeof(buf)) > 0) {
+                       if (buf[0] == '.' && buf[1] == '\n') break;
+                       strretchomp(buf);
+                       g_ptr_array_add(files, g_strdup(buf));
+               }
+               open_compose_new(mailto, files);
+               ptr_array_free_strings(files);
+               g_ptr_array_free(files, TRUE);
+               g_free(mailto);
        } else if (!strncmp(buf, "compose", 7)) {
-               open_compose_new_with_recipient(buf + strlen("compose") + 1);
+               open_compose_new(buf + strlen("compose") + 1, NULL);
+       } else if (!strncmp(buf, "send", 4)) {
+               send_queue();
+       } else if (!strncmp(buf, "online", 6)) {
+               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));
        }
+
+       fd_close(sock);
 }
 
-static void open_compose_new_with_recipient(const gchar *address)
+static void open_compose_new(const gchar *address, GPtrArray *attach_files)
 {
        gchar *addr = NULL;
 
@@ -448,9 +770,28 @@ static void open_compose_new_with_recipient(const gchar *address)
                g_strstrip(addr);
        }
 
-       if (addr && *addr != '\0')
-               compose_new_with_recipient(NULL, addr);
-       else
-               compose_new(NULL);
+       compose_new(NULL, addr, 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;
+
+               if (folder->queue) {
+                       if (procmsg_send_queue
+                               (folder->queue, prefs_common.savemsg) < 0)
+                               alertpanel_error(_("Some errors occurred while sending queued messages."));
+                       folder_item_scan(folder->queue);
+                       if (prefs_common.savemsg && folder->outbox) {
+                               if (folder->outbox == def_outbox)
+                                       def_outbox = NULL;
+                       }
+               }
+       }
+}