/*
* 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 "import.h"
#include "manage_window.h"
#include "alertpanel.h"
+#include "statusbar.h"
#include "addressbook.h"
#include "compose.h"
#include "folder.h"
gboolean compose;
const gchar *compose_mailto;
gboolean status;
+ gboolean send;
} cmd;
static void parse_cmd_opt(int argc, char *argv[]);
static void open_compose_new_with_recipient (const gchar *address);
+static void send_queue (void);
+
#if 0
/* for gettext */
_("File `%s' already exists.\n"
/* 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.\n");
+ puts("0 Sylpheed not running.");
return 0;
}
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();
}
account_set_missing_folder();
+ folder_set_missing_folders();
folderview_set(folderview);
/* prefs_scoring_read_config(); */
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;
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);
- } else if (!strncmp(argv[i], "--status", 5)) {
+ } else if (!strncmp(argv[i], "--status", 8)) {
cmd.status = TRUE;
} else if (!strncmp(argv[i], "--help", 6)) {
g_print(_("Usage: %s [OPTION]...\n"),
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"));
puts(_(" --version output version information and exit"));
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];
- fd_write(uxsock, "status\n", 9);
+ fd_write(uxsock, "status\n", 7);
fd_gets(uxsock, buf, sizeof(buf));
- puts(buf);
+ fputs(buf, stdout);
} else
fd_write(uxsock, "popup\n", 6);
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)) {
- gchar buf[BUFFSIZE];
- guint newmsgs, unreadmsgs, totalmsgs;
+ guint new, unread, total;
- folder_count_total_msgs(&newmsgs, &unreadmsgs, &totalmsgs);
- snprintf(buf, sizeof(buf), "%d %d %d\n", newmsgs, unreadmsgs, totalmsgs);
+ folder_count_total_msgs(&new, &unread, &total);
+ g_snprintf(buf, sizeof(buf), "%d %d %d\n", new, unread, total);
fd_write(sock, buf, strlen(buf));
}
+
fd_close(sock);
}
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);
+}
projects / claws.git / blobdiff