gboolean exit;
gboolean subscribe;
const gchar *subscribe_uri;
+ const gchar *target;
} cmd;
static void parse_cmd_opt(int argc, char *argv[]);
sn_context = sn_launchee_context_new_from_environment(sn_display,
DefaultScreen(xdisplay));
- if (sn_context != NULL)
- {
+ if (sn_context != NULL) {
sn_launchee_context_complete(sn_context);
sn_launchee_context_unref(sn_context);
sn_display_unref(sn_display);
}
- if (with_window)
+ if (with_window) {
gtk_widget_destroy(hack);
+ }
}
#endif /* HAVE_STARTUP_NOTIFICATION */
void sylpheed_gtk_idle(void)
{
- while(gtk_events_pending())
+ while(gtk_events_pending()) {
gtk_main_iteration();
+ }
g_usleep(50000);
}
return FALSE;
}
+static gboolean defer_jump(void *data)
+{
+ mainwindow_jump_to(data);
+ return FALSE;
+}
+
static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cfg_dir)
{
gchar *message = g_strdup_printf(_("Configuration for Sylpheed-Claws %s found.\n"
GtkWidget *window = NULL;
if (alertpanel(_("Migration of configuration"),
message,
- GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE)
+ GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE) {
return FALSE;
+ }
window = label_window_create(_("Copying configuration..."));
GTK_EVENTS_FLUSH();
FolderView *folderview;
GdkPixbuf *icon;
gboolean crash_file_present = FALSE;
-
+ gint num_folder_class = 0;
if (!sylpheed_init(&argc, &argv)) {
return 0;
}
if (cmd.exit)
return 0;
#endif
- g_thread_init(NULL);
- /* gdk_threads_init(); */
+ if (!g_thread_supported())
+ g_thread_init(NULL);
gtk_set_locale();
gtk_init(&argc, &argv);
gtk_widget_set_default_colormap(gdk_rgb_get_colormap());
gtk_widget_set_default_visual(gdk_rgb_get_visual());
- if (!g_thread_supported())
+ if (!g_thread_supported()) {
g_error(_("g_thread is not supported by glib.\n"));
+ }
+ /* check that we're not on a too recent/old gtk+ */
+#if GTK_CHECK_VERSION(2, 9, 0)
+ if (gtk_check_version(2, 9, 0) != NULL) {
+ alertpanel_error(_("Sylpheed-Claws has been compiled with "
+ "a more recent GTK+ library than is "
+ "currently available. This will cause "
+ "crashes. You need to upgrade GTK+ or "
+ "recompile Sylpheed-Claws."));
+ exit(1);
+ }
+#else
+ if (gtk_check_version(2, 9, 0) == NULL) {
+ alertpanel_error(_("Sylpheed-Claws has been compiled with "
+ "an older GTK+ library than is "
+ "currently available. This will cause "
+ "crashes. You need to recompile "
+ "Sylpheed-Claws."));
+ exit(1);
+ }
+#endif
/* parse gtkrc files */
userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc-2.0",
NULL);
renderer_read_config();
gtkut_widget_init();
- stock_pixbuf_gdk(NULL, STOCK_PIXMAP_SYLPHEED_ICON, &icon);
+ stock_pixbuf_gdk(NULL, STOCK_PIXMAP_SYLPHEED_CLAWS_ICON, &icon);
gtk_window_set_default_icon(icon);
folderview_initialize();
mainwin = main_window_create
(prefs_common.sep_folder | prefs_common.sep_msg << 1);
+ manage_window_focus_in(mainwin->window, NULL, NULL);
folderview = mainwin->folderview;
gtk_clist_freeze(GTK_CLIST(mainwin->folderview->ctree));
if (folder_read_list() < 0) {
if (!run_wizard(mainwin, TRUE))
exit(1);
+ main_window_reflect_prefs_all_now();
folder_write_list();
}
exit_sylpheed(mainwin);
}
+
+ toolbar_main_set_sensitive(mainwin);
+ main_window_set_menu_sensitive(mainwin);
+
main_window_popup(mainwin);
#ifdef HAVE_LIBETPAN
- imap_main_init();
+ imap_main_init(prefs_common.skip_ssl_cert_check);
#endif
account_set_missing_folder();
folder_set_missing_folders();
/* if Sylpheed crashed, rebuild caches */
if (!cmd.crash && crash_file_present) {
+ GTK_EVENTS_FLUSH();
debug_print("Sylpheed-Claws crashed, checking for new messages in local folders\n");
folder_item_update_thaw();
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 */
-#ifdef G_OS_UNIX
- signal(SIGPIPE, SIG_IGN);
-#endif
- if (cmd.online_mode == ONLINE_MODE_OFFLINE)
+ if (cmd.online_mode == ONLINE_MODE_OFFLINE) {
main_window_toggle_work_offline(mainwin, TRUE, FALSE);
- if (cmd.online_mode == ONLINE_MODE_ONLINE)
+ }
+ if (cmd.online_mode == ONLINE_MODE_ONLINE) {
main_window_toggle_work_offline(mainwin, FALSE, FALSE);
+ }
if (cmd.status_folders) {
g_ptr_array_free(cmd.status_folders, TRUE);
prefs_toolbar_init();
+ num_folder_class = g_list_length(folder_get_list());
+
plugin_load_all("GTK2");
+
+ if (g_list_length(folder_get_list()) != num_folder_class) {
+ debug_print("new folders loaded, reloading processing rules\n");
+ prefs_matcher_read_config();
+ }
+ if (plugin_get_unloaded_list() != NULL) {
+ main_window_cursor_normal(mainwin);
+ alertpanel_warning(_("Some plugin(s) failed to load. "
+ "Check the Plugins configuration "
+ "for more information."));
+ main_window_cursor_wait(mainwin);
+ }
+
+ plugin_load_standard_plugins ();
+
if (!folder_have_mailbox()) {
+ main_window_cursor_normal(mainwin);
alertpanel_error(_("Sylpheed-Claws has detected a configured "
"mailbox, but could not load it. It is "
"probably provided by an out-of-date "
gtk_clist_thaw(GTK_CLIST(mainwin->folderview->ctree));
main_window_cursor_normal(mainwin);
- if (cmd.receive_all)
+ if (cmd.receive_all) {
g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(FALSE));
- else if (prefs_common.chk_on_startup)
+ } else if (prefs_common.chk_on_startup) {
g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(TRUE));
- else if (cmd.receive)
+ } else if (cmd.receive) {
g_timeout_add(1000, defer_check, NULL);
- else
+ } else {
gtk_widget_grab_focus(folderview->ctree);
+ }
- if (cmd.compose)
+ if (cmd.compose) {
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.subscribe)
+ if (cmd.subscribe) {
folder_subscribe(cmd.subscribe_uri);
+ }
- if (cmd.send)
+ if (cmd.send) {
send_queue();
+ }
+ if (cmd.target) {
+ g_timeout_add(500, defer_jump, (gpointer)cmd.target);
+ }
+
gtk_main();
exit_sylpheed(mainwin);
static void save_all_caches(FolderItem *item, gpointer data)
{
- if (!item->cache)
+ gint free_caches = GPOINTER_TO_INT(data);
+ if (!item->cache) {
return;
- folder_item_write_cache(item);
+ }
+
+ if (item->opened)
+ folder_item_close(item);
+
+ if (free_caches)
+ folder_item_free_cache(item, TRUE);
+ else
+ folder_item_write_cache(item);
}
+static gboolean sc_exiting = FALSE;
+
static void exit_sylpheed(MainWindow *mainwin)
{
gchar *filename;
+ sc_exiting = TRUE;
+
debug_print("shutting down\n");
inc_autocheck_timer_remove();
- if (prefs_common.clean_on_exit)
+ 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)
- {
+ if(mainwin->folderview->opened) {
FolderItem *item;
item = gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->folderview->ctree), mainwin->folderview->opened);
/* save all state before exiting */
folder_write_list();
- folder_func_to_all_folders(save_all_caches, NULL);
+ folder_func_to_all_folders(save_all_caches, GINT_TO_POINTER(1));
main_window_get_size(mainwin);
main_window_get_position(mainwin);
gint i;
for (i = 1; i < argc; i++) {
- 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))
+ } else if (!strncmp(argv[i], "--receive", 9)) {
cmd.receive = TRUE;
- else if (!strncmp(argv[i], "--compose", 9)) {
+ } else if (!strncmp(argv[i], "--compose", 9)) {
const gchar *p = argv[i + 1];
cmd.compose = TRUE;
cmd.compose_mailto = NULL;
if (p && *p != '\0' && *p != '-') {
- if (!strncmp(p, "mailto:", 7))
+ if (!strncmp(p, "mailto:", 7)) {
cmd.compose_mailto = p + 7;
- else
+ } else {
cmd.compose_mailto = p;
+ }
i++;
}
} else if (!strncmp(argv[i], "--subscribe", 11)) {
gchar *file;
while (p && *p != '\0' && *p != '-') {
- if (!cmd.attach_files)
+ if (!cmd.attach_files) {
cmd.attach_files = g_ptr_array_new();
- if (*p != G_DIR_SEPARATOR)
+ }
+ if (*p != G_DIR_SEPARATOR) {
file = g_strconcat(sylpheed_get_startup_dir(),
G_DIR_SEPARATOR_S,
p, NULL);
- else
+ } else {
file = g_strdup(p);
+ }
g_ptr_array_add(cmd.attach_files, file);
i++;
p = argv[i + 1];
cmd.status_full = TRUE;
while (p && *p != '\0' && *p != '-') {
- if (!cmd.status_full_folders)
+ 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++;
g_print("%s\n", _(" --status [folder]... show the total number of messages"));
g_print("%s\n", _(" --status-full [folder]...\n"
" show the status of each folder"));
+ g_print("%s\n", _(" --select folder[/msg] jumps to the specified folder/message\n"
+ " folder is a folder id like '#mh/Mailbox/inbox'"));
g_print("%s\n", _(" --online switch to online mode"));
g_print("%s\n", _(" --offline switch to offline mode"));
g_print("%s\n", _(" --exit exit Sylpheed-Claws"));
exit(0);
} else if (!strncmp(argv[i], "--exit", 6)) {
cmd.exit = TRUE;
+ } else if (!strncmp(argv[i], "--select", 8) && i+1 < argc) {
+ cmd.target = argv[i+1];
} else if (i == 1 && argc == 2) {
/* only one parameter. Do something intelligent about it */
if (strstr(argv[i], "@") && !strstr(argv[i], "://")) {
cmd.compose = TRUE;
cmd.compose_mailto = NULL;
if (p && *p != '\0' && *p != '-') {
- if (!strncmp(p, "mailto:", 7))
+ if (!strncmp(p, "mailto:", 7)) {
cmd.compose_mailto = p + 7;
- else
+ } else {
cmd.compose_mailto = p;
+ }
}
} else if (strstr(argv[i], "://")) {
const gchar *p = argv[i];
FolderItem *queue;
queue = folder_get_default_queue();
- if (!queue) return -1;
+ if (!queue) {
+ return -1;
+ }
folder_item_scan(queue);
return queue->total_msgs;
g_free(buf);
- if (item->prefs->enable_processing)
- folder_item_apply_processing(item);
+ if (item->prefs->enable_processing) {
+ folder_item_apply_processing(item);
+ }
debug_print("done.\n");
STATUSBAR_POP(mainwin);
{
static gboolean firstrun = TRUE;
- if (!firstrun)
+ if (!firstrun) {
return FALSE;
+ }
firstrun = FALSE;
/*!< Good idea to have the main window stored in a
/* FIXME: Use something else to signal that we're
* in the original spawner, and not in a spawned
* child. */
- if (!static_mainwindow)
+ if (!static_mainwindow) {
return FALSE;
+ }
draft_all_messages();
void app_will_exit(GtkWidget *widget, gpointer data)
{
MainWindow *mainwin = data;
-
+
+ if (sc_exiting == TRUE) {
+ debug_print("exit pending\n");
+ return;
+ }
+ sc_exiting = TRUE;
+ debug_print("exiting\n");
if (compose_get_compose_list()) {
gint val = alertpanel(_("Really quit?"),
_("Composing message exists."),
_("_Save to Draft"), _("_Discard them"), _("Do_n't quit"));
switch (val) {
case G_ALERTOTHER:
+ sc_exiting = FALSE;
return;
case G_ALERTALTERNATE:
break;
if (alertpanel(_("Queued messages"),
_("Some unsent messages are queued. Exit now?"),
GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL)
- != G_ALERTALTERNATE)
+ != G_ALERTALTERNATE) {
+ sc_exiting = FALSE;
return;
+ }
manage_window_focus_in(mainwin->window, NULL, NULL);
}
sock_cleanup();
-
+ if (folderview_get_selected_item(mainwin->folderview))
+ folder_item_close(folderview_get_selected_item(mainwin->folderview));
gtk_main_quit();
}
+gboolean sylpheed_is_exiting(void)
+{
+ return sc_exiting;
+}
+
/*
* CLAWS: want this public so crash dialog can delete the
* lock file too
debug_print("another Sylpheed-Claws instance is already running.\n");
- if (cmd.receive_all)
+ if (cmd.receive_all) {
fd_write_all(uxsock, "receive_all\n", 12);
- else if (cmd.receive)
+ } else if (cmd.receive) {
fd_write_all(uxsock, "receive\n", 8);
- else if (cmd.compose && cmd.attach_files) {
+ } else if (cmd.compose && cmd.attach_files) {
gchar *str, *compose_str;
gint i;
- if (cmd.compose_mailto)
+ if (cmd.compose_mailto) {
compose_str = g_strdup_printf("compose_attach %s\n",
cmd.compose_mailto);
- else
+ } else {
compose_str = g_strdup("compose_attach\n");
+ }
fd_write_all(uxsock, compose_str, strlen(compose_str));
g_free(compose_str);
} else if (cmd.compose) {
gchar *compose_str;
- if (cmd.compose_mailto)
+ if (cmd.compose_mailto) {
compose_str = g_strdup_printf
("compose %s\n", cmd.compose_mailto);
- else
+ } else {
compose_str = g_strdup("compose\n");
+ }
fd_write_all(uxsock, compose_str, strlen(compose_str));
g_free(compose_str);
}
} else if (cmd.exit) {
fd_write_all(uxsock, "exit\n", 5);
+ } else if (cmd.target) {
+ gchar *str = g_strdup_printf("select %s\n", cmd.target);
+ fd_write_all(uxsock, str, strlen(str));
+ g_free(str);
} else
fd_write_all(uxsock, "popup\n", 6);
#ifdef G_OS_UNIX
gchar *filename;
- if (lock_socket < 0) return -1;
+ if (lock_socket < 0) {
+ return -1;
+ }
- if (lock_socket_tag > 0)
+ if (lock_socket_tag > 0) {
gdk_input_remove(lock_socket_tag);
+ }
fd_close(lock_socket);
filename = get_socket_name();
g_unlink(filename);
for (;;) {
fd_gets(sock, buf, sizeof(buf));
- if (!strncmp(buf, ".\n", 2)) break;
+ if (!strncmp(buf, ".\n", 2)) {
+ break;
+ }
strretchomp(buf);
- if (!folders) folders = g_ptr_array_new();
+ if (!folders) {
+ folders = g_ptr_array_new();
+ }
item = folder_find_item_from_identifier(buf);
- if (item)
+ if (item) {
g_ptr_array_add(folders, item);
- else
+ } else {
g_warning("no such folder: %s\n", buf);
+ }
}
return folders;
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;
+ if (buf[0] == '.' && buf[1] == '\n') {
+ break;
+ }
strretchomp(buf);
g_ptr_array_add(files, g_strdup(buf));
}
fd_write_all(sock, ".\n", 2);
g_free(status);
if (folders) g_ptr_array_free(folders, TRUE);
+ } else if (!strncmp(buf, "select ", 7)) {
+ const gchar *target = buf+7;
+ mainwindow_jump_to(target);
} else if (!strncmp(buf, "exit", 4)) {
app_will_exit(NULL, mainwin);
}
static void send_queue(void)
{
GList *list;
-
+ gchar *errstr = NULL;
for (list = folder_get_list(); list != NULL; list = list->next) {
Folder *folder = list->data;
if (folder->queue) {
gint res = procmsg_send_queue
- (folder->queue, prefs_common.savemsg);
+ (folder->queue, prefs_common.savemsg,
+ &errstr);
- if (res < 0)
- alertpanel_error(_("Some errors occurred while sending queued messages."));
- if (res)
+ if (res) {
folder_item_scan(folder->queue);
+ }
}
}
+ if (errstr) {
+ gchar *tmp = g_strdup_printf(_("Some errors occurred "
+ "while sending queued messages:\n%s"), errstr);
+ g_free(errstr);
+ alertpanel_error_log(tmp);
+ g_free(tmp);
+ } else {
+ alertpanel_error_log("Some errors occurred "
+ "while sending queued messages.");
+ }
}
static void quit_signal_handler(int sig)
{
+#ifdef SIGPIPE
+ if (sig == SIGPIPE) {
+ debug_print("caugth SIGPIPE, maybe X closing!\n");
+ signal(SIGPIPE, SIG_IGN); /* ignore following sigpipes */
+ folder_write_list();
+ folder_func_to_all_folders(save_all_caches, GINT_TO_POINTER(0));
+ return;
+ }
+#endif
debug_print("Quitting on signal %d\n", sig);
g_timeout_add(0, clean_quit, NULL);
#ifdef SIGHUP
sigaddset(&mask, SIGHUP);
#endif
+#ifdef SIGPIPE
+ sigaddset(&mask, SIGPIPE);
+#endif
act.sa_handler = quit_signal_handler;
act.sa_mask = mask;
#ifdef SIGHUP
sigaction(SIGHUP, &act, 0);
#endif
+#ifdef SIGPIPE
+ sigaction(SIGPIPE, &act, 0);
+#endif
sigprocmask(SIG_UNBLOCK, &mask, 0);
#endif /* !G_OS_WIN32 */
projects / claws.git / blobdiff