#if USE_GPGME
# include <gpgme.h>
+# include "passphrase.h"
#endif
#include "intl.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"
gboolean receive_all;
gboolean compose;
const gchar *compose_mailto;
+ GPtrArray *attach_files;
gboolean status;
gboolean send;
} cmd;
GdkInputCondition condition);
static 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 */
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"); \
} \
}
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
+ prog_version = PROG_VERSION;
+ startup_dir = g_get_current_dir();
+
parse_cmd_opt(argc, argv);
gtk_set_locale();
gtk_item_factory_parse_rc(userrc);
g_free(userrc);
- prog_version = PROG_VERSION;
- startup_dir = g_get_current_dir();
-
CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
/* check and create unix domain socket */
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(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",
}
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 */
- processing_apply(mainwin->summaryview);
+ folder_func_to_all_folders(initial_processing, (gpointer *)mainwin);
addressbook_read_file();
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();
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)) {
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"));
exit(1);
}
}
+
+ if (cmd.attach_files && cmd.compose == FALSE) {
+ cmd.compose = TRUE;
+ cmd.compose_mailto = NULL;
+ }
}
static gint get_queued_message_num(void)
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);
+ STATUSBAR_PUSH(mainwin, 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);
+}
+
void app_will_exit(GtkWidget *widget, gpointer data)
{
MainWindow *mainwin = 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);
/* 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);
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)
sock = fd_accept(source);
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, prefs_common.newmail_notify_manu);
- } else if (!strncmp(buf, "receive", 7)){
+ } 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;
+ 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, "status", 6)) {
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;
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;
- if (procmsg_send_queue() < 0)
- alertpanel_error(_("Some errors occurred while sending queued messages."));
-
- statusbar_pop_all();
+ def_outbox = folder_get_default_outbox();
for (list = folder_get_list(); list != NULL; list = list->next) {
- Folder *folder;
+ Folder *folder = list->data;
- 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