#include "crash.h"
gchar *prog_version;
-gchar *startup_dir;
#ifdef CRASH_DIALOG
gchar *argv0;
#endif
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;
}
prog_version = PROG_VERSION;
- startup_dir = g_get_current_dir();
#ifdef CRASH_DIALOG
argv0 = g_strdup(argv[0]);
#endif
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;
gpgme_register_idle(idle_function_for_gpgme);
#endif
-#if USE_ASPELL
- gtkaspellcheckers = gtkaspell_checkers_new();
+#ifdef USE_ASPELL
+ gtkaspell_checkers_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();
mainwin);
account_read_config_all();
- account_save_config_all();
if (folder_read_list() < 0) {
setup(mainwin);
}
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);
addressbook_destroy();
-#if USE_ASPELL
- gtkaspell_checkers_delete();
+#ifdef USE_ASPELL
+ gtkaspell_checkers_quit();
#endif
sylpheed_done();
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
} 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)) {
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);
}
}
{
MainWindow *mainwin = data;
gchar *filename;
+ GList *list;
if (compose_get_compose_list()) {
gint val = alertpanel(_("Notice"),
/* 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);
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, "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_all(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_all(uxsock, "popup\n", 6);
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)
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);
} 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;
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_all(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);
projects / claws.git / blobdiff