sync with 0.7.4cvs29

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 414b1f330f380c6dd07cf864996e3595a6650062..c27cf00542397fadb4519e34dd9578a072387c58 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -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
@@ -65,6 +65,7 @@
 #include "import.h"
 #include "manage_window.h"
 #include "alertpanel.h"
+#include "statusbar.h"
 #include "addressbook.h"
 #include "compose.h"
 #include "folder.h"
@@ -94,6 +95,7 @@ static struct Cmd {
        gboolean compose;
        const gchar *compose_mailto;
        gboolean status;
+       gboolean send;
 } cmd;
 
 static void parse_cmd_opt(int argc, char *argv[]);
@@ -110,6 +112,8 @@ static gchar *get_socket_name               (void);
 
 static void open_compose_new_with_recipient    (const gchar    *address);
 
+static void send_queue                 (void);
+
 #if 0
 /* for gettext */
 _("File `%s' already exists.\n"
@@ -197,7 +201,7 @@ int main(int argc, char *argv[])
        if (lock_socket < 0) return 0;
 
        if (cmd.status) {
-               puts("0 Sylpheed not running.\n");
+               puts("0 Sylpheed not running.");
                return 0;
        }
 
@@ -249,13 +253,21 @@ int main(int argc, char *argv[])
        gpgme_register_idle(idle_function_for_gpgme);
 #endif
 
+#if USE_PSPELL
+       gtkpspellcheckers = gtkpspell_checkers_new();
+#endif
+       
+
        prefs_common_save_config();
        prefs_filter_read_config();
        prefs_filter_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();
 
@@ -282,6 +294,7 @@ int main(int argc, char *argv[])
        }
 
        account_set_missing_folder();
+       folder_set_missing_folders();
        folderview_set(folderview);
 
        /* prefs_scoring_read_config(); */
@@ -293,23 +306,27 @@ int main(int argc, char *argv[])
 
        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);
+               inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
        else if (cmd.receive)
-               inc_mail(mainwin);
+               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);
-
-       /* ignore SIGPIPE signal for preventing sudden death of program */
-       signal(SIGPIPE, SIG_IGN);
+       if (cmd.send)
+               send_queue();
 
        gtk_main();
 
+       addressbook_destroy();
+
 #if USE_PSPELL       
-       gtkpspell_finished(gtkpspellconfig);
+       gtkpspell_checkers_delete();
 #endif
 
        return 0;
@@ -338,6 +355,8 @@ static void parse_cmd_opt(int argc, char *argv[])
                                        cmd.compose_mailto = p;
                                i++;
                        }
+               } else if (!strncmp(argv[i], "--send", 6)) {
+                       cmd.send = TRUE;
                } else if (!strncmp(argv[i], "--version", 9)) {
                        puts("Sylpheed version " VERSION);
                        exit(0);
@@ -350,6 +369,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                        puts(_("  --compose [address]    open composition window"));
                        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(_("  --debug                debug mode"));
                        puts(_("  --help                 display this help and exit"));
@@ -481,6 +501,8 @@ 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.status) {
                gchar buf[BUFFSIZE];
 
@@ -509,12 +531,14 @@ static void lock_socket_input_cb(gpointer data,
                main_window_popup(mainwin);
        } else if (!strncmp(buf, "receive_all", 11)){
                main_window_popup(mainwin);
-               inc_all_account_mail(mainwin);
+               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", 7)) {
                open_compose_new_with_recipient(buf + strlen("compose") + 1);
+       } else if (!strncmp(buf, "send", 4)) {
+               send_queue();
        } else if (!strncmp(buf, "status", 6)) {
                guint new, unread, total;
 
@@ -540,3 +564,32 @@ static void open_compose_new_with_recipient(const gchar *address)
        else
                compose_new(NULL);
 }
+
+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."));
+                       statusbar_pop_all();
+                       folder_item_scan(folder->queue);
+                       folderview_update_item(folder->queue, TRUE);
+                       if (prefs_common.savemsg && folder->outbox) {
+                               folderview_update_item(folder->outbox, TRUE);
+                               if (folder->outbox == def_outbox)
+                                       def_outbox = NULL;
+                       }
+               }
+       }
+
+       if (prefs_common.savemsg && def_outbox)
+               folderview_update_item(def_outbox, TRUE);
+}