/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
*
* 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 <gdk/gdkx.h>
#endif
-#include "sylpheed.h"
+#include "claws.h"
#include "main.h"
#include "mainwindow.h"
#include "folderview.h"
#include "prefs_summaries.h"
#include "prefs_themes.h"
#include "prefs_other.h"
+#include "prefs_logging.h"
#include "prefs_send.h"
#include "prefs_wrapping.h"
#include "prefs_compose_writing.h"
#include "imap-thread.h"
#endif
#include "stock_pixmap.h"
-
+#ifdef HAVE_VALGRIND
+#include "valgrind.h"
+#endif
#if USE_OPENSSL
# include "ssl.h"
#endif
#include "crash.h"
+#include "timing.h"
+
+#ifdef MAEMO
+#include <hildon-widgets/hildon-program.h>
+#include <gtk/gtkmain.h>
+#include <libosso.h>
+
+#define OSSO_NAME "claws_mail"
+#define OSSO_SERVICE "com.nokia."OSSO_NAME
+#define OSSO_OBJECT "/com/nokia/"OSSO_NAME
+#define OSSO_IFACE "com.nokia."OSSO_NAME
+
+typedef struct _AppData AppData;
+struct _AppData {
+ HildonProgram *program;
+ HildonWindow *window;
+ osso_context_t *osso_context;
+};
+#endif
+
gchar *prog_version;
gchar *argv0;
static gint lock_socket = -1;
static gint lock_socket_tag = 0;
-
+static gchar *x_display = NULL;
typedef enum
{
ONLINE_MODE_DONT_CHANGE,
static void lock_socket_input_cb (gpointer data,
gint source,
GdkInputCondition condition);
-#ifndef CLAWS
-static
-#endif
-gchar *get_socket_name (void);
-
static void open_compose_new (const gchar *address,
GPtrArray *attach_files);
static void initial_processing (FolderItem *item, gpointer data);
static void quit_signal_handler (int sig);
static void install_basic_sighandlers (void);
-static void exit_sylpheed (MainWindow *mainwin);
+static void exit_claws (MainWindow *mainwin);
#define MAKE_DIR_IF_NOT_EXIST(dir) \
{ \
}
static MainWindow *static_mainwindow;
+
+#ifdef MAEMO
+static HildonProgram *static_hildonprogram;
+void exit_event_handler(gboolean die_now, gpointer data)
+{
+ AppData *appdata;
+ appdata = (AppData *) data;
+ /* Do whatever application needs to do before exiting */
+ exit_claws(static_mainwindow);
+ hildon_banner_show_information(GTK_WIDGET(appdata->window), NULL,
+ _("Exiting..."));
+
+}
+
+/* Callback for normal D-BUS messages */
+gint dbus_req_handler(const gchar * interface, const gchar * method,
+ GArray * arguments, gpointer data,
+ osso_rpc_t * retval)
+{
+ AppData *appdata;
+ appdata = (AppData *) data;
+
+ osso_system_note_infoprint(appdata->osso_context, method, retval);
+ osso_rpc_free_val(retval);
+
+ return OSSO_OK;
+}
+#endif
static gboolean emergency_exit = FALSE;
#ifdef HAVE_STARTUP_NOTIFICATION
}
#endif /* HAVE_STARTUP_NOTIFICATION */
-void sylpheed_gtk_idle(void)
+static void claws_gtk_idle(void)
{
while(gtk_events_pending()) {
gtk_main_iteration();
g_usleep(50000);
}
-gboolean defer_check_all(void *data)
+static gboolean defer_check_all(void *data)
{
gboolean autochk = GPOINTER_TO_INT(data);
return FALSE;
}
-gboolean defer_check(void *data)
+static gboolean defer_check(void *data)
{
inc_mail(static_mainwindow, prefs_common.newmail_notify_manu);
return FALSE;
}
-static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cfg_dir)
+static void chk_update_val(GtkWidget *widget, gpointer data)
+{
+ gboolean *val = (gboolean *)data;
+ *val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+}
+
+static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cfg_dir, const gchar *oldversion)
{
- gchar *message = g_strdup_printf(_("Configuration for Sylpheed-Claws %s found.\n"
- "Do you want to migrate this configuration?"),
- !strcmp(old_cfg_dir, OLD_GTK1_RC_DIR)?
- _("1.0.5 or previous"):_("1.9.15 or previous"));
+ gchar *message = g_strdup_printf(_("Configuration for %s (or previous) found.\n"
+ "Do you want to migrate this configuration?"), oldversion);
gint r = 0;
GtkWidget *window = NULL;
- if (alertpanel(_("Migration of configuration"),
- message,
- GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE) {
+ GtkWidget *keep_backup_chk;
+ GtkTooltips *tips = gtk_tooltips_new();
+ gboolean backup = TRUE;
+
+ keep_backup_chk = gtk_check_button_new_with_label (_("Keep old configuration"));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_backup_chk), TRUE);
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), keep_backup_chk,
+ _("Keeping a backup will allow you to go back to an "
+ "older version, but may take a while if you have "
+ "cached IMAP or News data, and will take some extra "
+ "room on your disk."),
+ NULL);
+
+ g_signal_connect(G_OBJECT(keep_backup_chk), "toggled",
+ G_CALLBACK(chk_update_val), &backup);
+
+ if (alertpanel_full(_("Migration of configuration"), message,
+ GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL, FALSE,
+ keep_backup_chk, ALERT_QUESTION, G_ALERTDEFAULT) != G_ALERTALTERNATE) {
return FALSE;
}
- window = label_window_create(_("Copying configuration..."));
- GTK_EVENTS_FLUSH();
- r = copy_dir(old_cfg_dir, new_cfg_dir);
- gtk_widget_destroy(window);
- if (r != 0) {
- alertpanel_error(_("Migration failed!"));
+ /* we can either do a fast migration requiring not any extra disk
+ * space, or a slow one that copies the old configuration and leaves
+ * it in place. */
+ if (backup) {
+backup_mode:
+ window = label_window_create(_("Copying configuration... This may take a while..."));
+ GTK_EVENTS_FLUSH();
+
+ r = copy_dir(old_cfg_dir, new_cfg_dir);
+ gtk_widget_destroy(window);
+
+ /* if copy failed, we'll remove the partially copied
+ * new directory */
+ if (r != 0) {
+ alertpanel_error(_("Migration failed!"));
+ remove_dir_recursive(new_cfg_dir);
+ } else {
+ if (!backup) {
+ /* fast mode failed, but we don't want backup */
+ remove_dir_recursive(old_cfg_dir);
+ }
+ }
+ } else {
+ window = label_window_create(_("Migrating configuration..."));
+ GTK_EVENTS_FLUSH();
+
+ r = g_rename(old_cfg_dir, new_cfg_dir);
+ gtk_widget_destroy(window);
+
+ /* if g_rename failed, we'll try to copy */
+ if (r != 0) {
+ FILE_OP_ERROR(new_cfg_dir, "g_rename failed, trying copy\n");
+ goto backup_mode;
+ }
}
return (r == 0);
}
+static void migrate_common_rc(const gchar *old_rc, const gchar *new_rc)
+{
+ FILE *oldfp, *newfp;
+ gchar *plugin_path, *old_plugin_path, *new_plugin_path;
+ gchar buf[BUFFSIZE];
+ oldfp = g_fopen(old_rc, "r");
+ if (!oldfp)
+ return;
+ newfp = g_fopen(new_rc, "w");
+ if (!newfp) {
+ fclose(oldfp);
+ return;
+ }
+
+ plugin_path = g_strdup(get_plugin_dir());
+ new_plugin_path = g_strdup(plugin_path);
+
+ if (strstr(plugin_path, "/claws-mail/")) {
+ gchar *end = g_strdup(strstr(plugin_path, "/claws-mail/")+strlen("/claws-mail/"));
+ *(strstr(plugin_path, "/claws-mail/")) = '\0';
+ old_plugin_path = g_strconcat(plugin_path, "/sylpheed-claws/", end, NULL);
+ g_free(end);
+ } else {
+ old_plugin_path = g_strdup(new_plugin_path);
+ }
+ debug_print("replacing %s with %s\n", old_plugin_path, new_plugin_path);
+ while (fgets(buf, sizeof(buf), oldfp)) {
+ if (strncmp(buf, old_plugin_path, strlen(old_plugin_path))) {
+ fputs(buf, newfp);
+ } else {
+ debug_print("->replacing %s", buf);
+ debug_print(" with %s%s", new_plugin_path, buf+strlen(old_plugin_path));
+ fputs(new_plugin_path, newfp);
+ fputs(buf+strlen(old_plugin_path), newfp);
+ }
+ }
+ g_free(plugin_path);
+ g_free(new_plugin_path);
+ g_free(old_plugin_path);
+ fclose(oldfp);
+ fclose(newfp);
+}
+
#ifdef HAVE_LIBSM
static void
sc_client_set_value (MainWindow *mainwin,
}
#endif
+static gboolean sc_exiting = FALSE;
+static gboolean sc_starting = FALSE;
+static gboolean show_at_startup = TRUE;
+
+void main_set_show_at_startup(gboolean show)
+{
+ show_at_startup = show;
+}
+
int main(int argc, char *argv[])
{
+#ifdef MAEMO
+ osso_context_t *osso_context;
+ osso_return_t result;
+#endif
gchar *userrc;
MainWindow *mainwin;
FolderView *folderview;
GdkPixbuf *icon;
gboolean crash_file_present = FALSE;
gint num_folder_class = 0;
- if (!sylpheed_init(&argc, &argv)) {
+ gboolean asked_for_migration = FALSE;
+
+ START_TIMING("startup");
+
+ sc_starting = TRUE;
+
+ if (!claws_init(&argc, &argv)) {
return 0;
}
+ prefs_prepare_cache();
prog_version = PROG_VERSION;
argv0 = g_strdup(argv[0]);
}
if (cmd.status || cmd.status_full) {
- puts("0 Sylpheed-Claws not running.");
+ puts("0 Claws Mail not running.");
lock_socket_remove();
return 0;
}
gtk_set_locale();
gtk_init(&argc, &argv);
+#ifdef MAEMO
+ osso_context = osso_initialize(OSSO_SERVICE, "2.8.1", TRUE, NULL);
+ if (osso_context == NULL) {
+ return OSSO_ERROR;
+ }
+ static_hildonprogram = HILDON_PROGRAM(hildon_program_get_instance());
+#endif
gdk_rgb_init();
gtk_widget_set_default_colormap(gdk_rgb_get_colormap());
gtk_widget_set_default_visual(gdk_rgb_get_visual());
/* 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 "
+ alertpanel_error(_("Claws Mail 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."));
+ "recompile Claws Mail."));
exit(1);
}
#else
if (gtk_check_version(2, 9, 0) == NULL) {
- alertpanel_error(_("Sylpheed-Claws has been compiled with "
+ alertpanel_error(_("Claws Mail has been compiled with "
"an older GTK+ library than is "
"currently available. This will cause "
"crashes. You need to recompile "
- "Sylpheed-Claws."));
+ "Claws Mail."));
exit(1);
}
#endif
g_free(userrc);
CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
+
+ /* no config dir exists. See if we can migrate an old config. */
if (!is_dir_exist(RC_DIR)) {
+ prefs_destroy_cache();
gboolean r = FALSE;
- if (is_dir_exist(OLD_GTK2_RC_DIR))
- r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR);
- else if (is_dir_exist(OLD_GTK1_RC_DIR))
- r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR);
+
+ /* if one of the old dirs exist, we'll ask if the user
+ * want to migrates, and r will be TRUE if he said yes
+ * and migration succeeded, and FALSE otherwise.
+ */
+ if (is_dir_exist(OLD_GTK2_RC_DIR)) {
+ r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR, "Sylpheed-Claws 2.6.0");
+ asked_for_migration = TRUE;
+ } else if (is_dir_exist(OLDER_GTK2_RC_DIR)) {
+ r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR, "Sylpheed-Claws 1.9.15");
+ asked_for_migration = TRUE;
+ } else if (is_dir_exist(OLD_GTK1_RC_DIR)) {
+ r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR, "Sylpheed-Claws 1.0.5");
+ asked_for_migration = TRUE;
+ }
+
+ /* If migration failed or the user didn't want to do it,
+ * we create a new one (and we'll hit wizard later).
+ */
if (r == FALSE && !is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0)
exit(1);
}
+
+
+ if (!is_file_exist(RC_DIR G_DIR_SEPARATOR_S COMMON_RC) &&
+ is_file_exist(RC_DIR G_DIR_SEPARATOR_S OLD_COMMON_RC)) {
+ /* post 2.6 name change */
+ migrate_common_rc(RC_DIR G_DIR_SEPARATOR_S OLD_COMMON_RC,
+ RC_DIR G_DIR_SEPARATOR_S COMMON_RC);
+ }
+
+ if (!cmd.exit)
+ plugin_load_all("Common");
userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "gtkrc-2.0", NULL);
gtk_rc_parse(userrc);
gtk_accel_map_load (userrc);
g_free(userrc);
- gtk_settings_set_long_property(gtk_settings_get_default(),
- "gtk-can-change-accels",
- (glong)TRUE, "XProperty");
-
CHDIR_RETURN_VAL_IF_FAIL(get_rc_dir(), 1);
MAKE_DIR_IF_NOT_EXIST(get_mail_base_dir());
remove_all_files(get_tmp_dir());
remove_all_files(get_mime_tmp_dir());
- if (is_file_exist("sylpheed.log")) {
- if (rename_force("sylpheed.log", "sylpheed.log.bak") < 0)
- FILE_OP_ERROR("sylpheed.log", "rename");
+ if (is_file_exist("claws.log")) {
+ if (rename_force("claws.log", "claws.log.bak") < 0)
+ FILE_OP_ERROR("claws.log", "rename");
+ }
+ set_log_file(LOG_PROTOCOL, "claws.log");
+
+ if (is_file_exist("filtering.log")) {
+ if (rename_force("filtering.log", "filtering.log.bak") < 0)
+ FILE_OP_ERROR("filtering.log", "rename");
}
- set_log_file("sylpheed.log");
+ set_log_file(LOG_DEBUG_FILTERING, "filtering.log");
CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
prefs_summaries_init();
prefs_message_init();
prefs_other_init();
+ prefs_logging_init();
prefs_receive_init();
prefs_send_init();
#ifdef USE_ASPELL
gtkaspell_checkers_init();
prefs_spelling_init();
#endif
-
+
sock_set_io_timeout(prefs_common.io_timeout_secs);
#ifdef HAVE_LIBETPAN
imap_main_set_timeout(prefs_common.io_timeout_secs);
renderer_read_config();
gtkut_widget_init();
- stock_pixbuf_gdk(NULL, STOCK_PIXMAP_SYLPHEED_CLAWS_ICON, &icon);
+ stock_pixbuf_gdk(NULL, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
gtk_window_set_default_icon(icon);
folderview_initialize();
mh_gtk_init();
imap_gtk_init();
news_gtk_init();
-
- mainwin = main_window_create
- (prefs_common.sep_folder | prefs_common.sep_msg << 1);
+
+ mainwin = main_window_create();
+#ifdef MAEMO
+ AppData *appdata;
+ appdata = g_new0(AppData, 1);
+ appdata->program = static_hildonprogram;
+ appdata->window = mainwin->window;
+ appdata->osso_context = osso_context;
+ result = osso_rpc_set_cb_f(appdata->osso_context,
+ OSSO_SERVICE,
+ OSSO_OBJECT,
+ OSSO_IFACE,
+ dbus_req_handler, appdata);
+ if (result != OSSO_OK) {
+ return OSSO_ERROR;
+ }
+
+ /* Add handler for Exit D-BUS messages */
+ result = osso_application_set_exit_cb(appdata->osso_context,
+ exit_event_handler,
+ (gpointer) appdata);
+ if (result != OSSO_OK) {
+ return OSSO_ERROR;
+ }
+#endif
manage_window_focus_in(mainwin->window, NULL, NULL);
folderview = mainwin->folderview;
prefs_account_init();
account_read_config_all();
+ /* If we can't read a folder list or don't have accounts,
+ * it means the configuration's not done. Either this is
+ * a brand new install, either a failed/refused migration.
+ * So we'll start the wizard.
+ */
if (folder_read_list() < 0) {
- if (!run_wizard(mainwin, TRUE))
+ prefs_destroy_cache();
+
+ /* if run_wizard returns FALSE it's because it's
+ * been cancelled. We can't do much but exit.
+ * however, if the user was asked for a migration,
+ * we remove the newly created directory so that
+ * he's asked again for migration on next launch.*/
+ if (!run_wizard(mainwin, TRUE)) {
+ if (asked_for_migration)
+ remove_dir_recursive(RC_DIR);
exit(1);
+ }
main_window_reflect_prefs_all_now();
folder_write_list();
}
if (!account_get_list()) {
- if (!run_wizard(mainwin, FALSE))
+ prefs_destroy_cache();
+ if (!run_wizard(mainwin, FALSE)) {
+ if (asked_for_migration)
+ remove_dir_recursive(RC_DIR);
exit(1);
+ }
account_read_config_all();
- if(!account_get_list())
- exit_sylpheed(mainwin);
+ if(!account_get_list()) {
+ exit_claws(mainwin);
+ exit(1);
+ }
}
toolbar_main_set_sensitive(mainwin);
main_window_set_menu_sensitive(mainwin);
- main_window_popup(mainwin);
+ /* if crashed, show window early so that the user
+ * sees what's happening */
+ if (!cmd.crash && crash_file_present)
+ main_window_popup(mainwin);
#ifdef HAVE_LIBETPAN
imap_main_init(prefs_common.skip_ssl_cert_check);
prefs_matcher_read_config();
- /* make one all-folder processing before using sylpheed */
+ /* make one all-folder processing before using claws */
main_window_cursor_wait(mainwin);
folder_func_to_all_folders(initial_processing, (gpointer *)mainwin);
- /* if Sylpheed crashed, rebuild caches */
+ /* if claws 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");
+ debug_print("Claws Mail crashed, checking for new messages in local folders\n");
folder_item_update_thaw();
folderview_check_new(NULL);
folder_clean_cache_memory_force();
cmd.status_full_folders = NULL;
}
- sylpheed_register_idle_function(sylpheed_gtk_idle);
+ claws_register_idle_function(claws_gtk_idle);
prefs_toolbar_init();
plugin_load_standard_plugins ();
+ /* if not crashed, show window now */
+ if (!(!cmd.crash && crash_file_present)) {
+ /* apart if something told not to show */
+ if (show_at_startup)
+ main_window_popup(mainwin);
+ }
+
if (!folder_have_mailbox()) {
+ prefs_destroy_cache();
main_window_cursor_normal(mainwin);
- alertpanel_error(_("Sylpheed-Claws has detected a configured "
+ if (folder_get_list() != NULL) {
+ alertpanel_error(_("Claws Mail has detected a configured "
+ "mailbox, but it is incomplete. It is "
+ "possibly due to a failing IMAP account. Use "
+ "\"Rebuild folder tree\" on the mailbox parent "
+ "folder's context menu to try to fix it."));
+ } else {
+ alertpanel_error(_("Claws Mail has detected a configured "
"mailbox, but could not load it. It is "
"probably provided by an out-of-date "
"external plugin. Please reinstall the "
"plugin and try again."));
- exit(1);
+ exit_claws(mainwin);
+ exit(1);
+ }
}
static_mainwindow = mainwin;
g_timeout_add(500, defer_jump, (gpointer)cmd.target);
}
+ prefs_destroy_cache();
+
+ compose_reopen_exit_drafts();
+
+ sc_starting = FALSE;
+ END_TIMING();
+
gtk_main();
- exit_sylpheed(mainwin);
+#ifdef MAEMO
+ osso_deinitialize(osso_context);
+#endif
+ exit_claws(mainwin);
return 0;
}
folder_item_free_cache(item, TRUE);
}
-static gboolean sc_exiting = FALSE;
-
-static void exit_sylpheed(MainWindow *mainwin)
+static void exit_claws(MainWindow *mainwin)
{
gchar *filename;
}
/* save all state before exiting */
- folder_write_list();
folder_func_to_all_folders(save_all_caches, NULL);
+ folder_write_list();
main_window_get_size(mainwin);
main_window_get_position(mainwin);
+
prefs_common_write_config();
account_write_config_all();
addressbook_export_to_file();
remove_all_files(get_tmp_dir());
remove_all_files(get_mime_tmp_dir());
- close_log_file();
+ close_log_file(LOG_PROTOCOL);
+ close_log_file(LOG_DEBUG_FILTERING);
#ifdef HAVE_LIBETPAN
imap_main_done();
prefs_spelling_done();
gtkaspell_checkers_quit();
#endif
- sylpheed_done();
+ plugin_unload_all("Common");
+ claws_done();
}
static void parse_cmd_opt(int argc, char *argv[])
}
} else if (!strncmp(argv[i], "--attach", 8)) {
const gchar *p = argv[i + 1];
- gchar *file;
+ gchar *file = NULL;
while (p && *p != '\0' && *p != '-') {
if (!cmd.attach_files) {
cmd.attach_files = g_ptr_array_new();
}
- if (*p != G_DIR_SEPARATOR) {
- file = g_strconcat(sylpheed_get_startup_dir(),
+ if ((file = g_filename_from_uri(p, NULL, NULL)) != NULL) {
+ if (!is_file_exist(file)) {
+ g_free(file);
+ file = NULL;
+ }
+ }
+ if (file == NULL && *p != G_DIR_SEPARATOR) {
+ file = g_strconcat(claws_get_startup_dir(),
G_DIR_SEPARATOR_S,
p, NULL);
- } else {
+ } else if (file == NULL) {
file = g_strdup(p);
}
g_ptr_array_add(cmd.attach_files, file);
}
} else if (!strncmp(argv[i], "--send", 6)) {
cmd.send = TRUE;
- } else if (!strncmp(argv[i], "--version", 9)) {
- puts("Sylpheed-Claws version " VERSION);
+ } else if (!strncmp(argv[i], "--version", 9) ||
+ !strncmp(argv[i], "-v", 2)) {
+ puts("Claws Mail version " VERSION);
exit(0);
} else if (!strncmp(argv[i], "--status-full", 13)) {
const gchar *p = argv[i + 1];
cmd.online_mode = ONLINE_MODE_ONLINE;
} else if (!strncmp(argv[i], "--offline", 9)) {
cmd.online_mode = ONLINE_MODE_OFFLINE;
- } else if (!strncmp(argv[i], "--help", 6)) {
+ } else if (!strncmp(argv[i], "--help", 6) ||
+ !strncmp(argv[i], "-h", 2)) {
gchar *base = g_path_get_basename(argv[0]);
g_print(_("Usage: %s [OPTION]...\n"), base);
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'"));
+ " folder is a folder id like 'folder/sub_folder'"));
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"));
+ g_print("%s\n", _(" --exit --quit -q exit Claws Mail"));
g_print("%s\n", _(" --debug debug mode"));
- g_print("%s\n", _(" --help display this help and exit"));
- g_print("%s\n", _(" --version output version information and exit"));
+ g_print("%s\n", _(" --help -h display this help and exit"));
+ g_print("%s\n", _(" --version -v output version information and exit"));
g_print("%s\n", _(" --config-dir output configuration directory"));
g_free(base);
} else if (!strncmp(argv[i], "--config-dir", sizeof "--config-dir" - 1)) {
puts(RC_DIR);
exit(0);
- } else if (!strncmp(argv[i], "--exit", 6)) {
+ } else if (!strncmp(argv[i], "--exit", 6) ||
+ !strncmp(argv[i], "--quit", 6) ||
+ !strncmp(argv[i], "-q", 2)) {
cmd.exit = TRUE;
} else if (!strncmp(argv[i], "--select", 8) && i+1 < argc) {
cmd.target = argv[i+1];
cmd.subscribe = TRUE;
cmd.subscribe_uri = p;
}
+ } else if (!strcmp(argv[i], "--sync")) {
+ /* gtk debug */
+ } else {
+ g_print(_("Unknown option\n"));
+ exit(1);
}
}
-
}
if (cmd.attach_files && cmd.compose == FALSE) {
}
}
-static gint get_queued_message_num(void)
-{
- FolderItem *queue;
-
- queue = folder_get_default_queue();
- if (!queue) {
- return -1;
- }
-
- folder_item_scan(queue);
- return queue->total_msgs;
-}
-
static void initial_processing(FolderItem *item, gpointer data)
{
MainWindow *mainwin = (MainWindow *)data;
{
GList *compose_list = NULL;
+ compose_clear_exit_drafts();
while ((compose_list = compose_get_compose_list()) != NULL) {
Compose *c = (Compose*)compose_list->data;
- compose_draft(c);
+ compose_draft(c, COMPOSE_DRAFT_FOR_EXIT);
}
}
gboolean clean_quit(gpointer data)
draft_all_messages();
emergency_exit = TRUE;
- exit_sylpheed(static_mainwindow);
+ exit_claws(static_mainwindow);
exit(0);
return FALSE;
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;
- default:
- draft_all_messages();
- }
-
- manage_window_focus_in(mainwin->window, NULL, NULL);
+ draft_all_messages();
}
- if (prefs_common.warn_queued_on_exit && get_queued_message_num() > 0) {
+ if (prefs_common.warn_queued_on_exit && procmsg_have_queued_mails_fast()) {
if (alertpanel(_("Queued messages"),
_("Some unsent messages are queued. Exit now?"),
GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL)
!= G_ALERTALTERNATE) {
+ main_window_popup(mainwin);
sc_exiting = FALSE;
return;
}
}
sock_cleanup();
+#ifdef HAVE_VALGRIND
+ if (RUNNING_ON_VALGRIND) {
+ summary_clear_list(mainwin->summaryview);
+ }
+#endif
if (folderview_get_selected_item(mainwin->folderview))
folder_item_close(folderview_get_selected_item(mainwin->folderview));
gtk_main_quit();
}
-gboolean sylpheed_is_exiting(void)
+gboolean claws_is_exiting(void)
{
return sc_exiting;
}
+gboolean claws_is_starting(void)
+{
+ return sc_starting;
+}
+
/*
* CLAWS: want this public so crash dialog can delete the
* lock file too
*/
-#ifndef CLAWS
-static
-#endif
-gchar *get_socket_name(void)
+gchar *claws_get_socket_name(void)
{
static gchar *filename = NULL;
if (filename == NULL) {
- filename = g_strdup_printf("%s%csylpheed-claws-%d",
+ filename = g_strdup_printf("%s%cclaws-mail-%d",
g_get_tmp_dir(), G_DIR_SEPARATOR,
#if HAVE_GETUID
getuid());
static gchar *filename = NULL;
if (filename == NULL) {
- filename = g_strdup_printf("%s%csylpheed-crashed",
+ filename = g_strdup_printf("%s%cclaws-crashed",
get_tmp_dir(), G_DIR_SEPARATOR);
}
gint uxsock;
gchar *path;
- path = get_socket_name();
+ path = claws_get_socket_name();
uxsock = fd_connect_unix(path);
+
+ if (x_display == NULL)
+ x_display = g_strdup(g_getenv("DISPLAY"));
+
if (uxsock < 0) {
g_unlink(path);
return fd_open_unix(path);
/* remote command mode */
- debug_print("another Sylpheed-Claws instance is already running.\n");
+ debug_print("another Claws Mail instance is already running.\n");
if (cmd.receive_all) {
fd_write_all(uxsock, "receive_all\n", 12);
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);
+ } else {
+ gchar buf[BUFSIZ];
+ fd_write_all(uxsock, "get_display\n", 12);
+ memset(buf, 0, sizeof(buf));
+ fd_gets(uxsock, buf, sizeof(buf));
+ if (strcmp2(buf, x_display)) {
+ printf("Claws Mail is already running on display %s.\n",
+ buf);
+ } else {
+ fd_close(uxsock);
+ uxsock = fd_connect_unix(path);
+ fd_write_all(uxsock, "popup\n", 6);
+ }
+ }
fd_close(uxsock);
return -1;
gdk_input_remove(lock_socket_tag);
}
fd_close(lock_socket);
- filename = get_socket_name();
+ filename = claws_get_socket_name();
g_unlink(filename);
#endif
if (!strncmp(buf, "popup", 5)) {
main_window_popup(mainwin);
+ } else if (!strncmp(buf, "get_display", 11)) {
+ fd_write_all(sock, x_display, strlen(x_display));
} else if (!strncmp(buf, "receive_all", 11)) {
inc_all_account_mail(mainwin, FALSE,
prefs_common.newmail_notify_manu);
{
GList *list;
gchar *errstr = NULL;
+ gboolean error = FALSE;
for (list = folder_get_list(); list != NULL; list = list->next) {
Folder *folder = list->data;
if (res) {
folder_item_scan(folder->queue);
}
+
+ if (res < 0)
+ error = TRUE;
}
}
if (errstr) {
g_free(errstr);
alertpanel_error_log(tmp);
g_free(tmp);
- } else {
+ } else if (error) {
alertpanel_error_log("Some errors occurred "
"while sending queued messages.");
}
sigprocmask(SIG_UNBLOCK, &mask, 0);
#endif /* !G_OS_WIN32 */
}
+
+#ifdef MAEMO
+HildonProgram *hildon_program()
+{
+ return static_hildonprogram;
+}
+#endif