*
* 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
#include "imap_gtk.h"
#include "news_gtk.h"
#include "matcher.h"
+#include "tags.h"
#ifdef HAVE_LIBETPAN
#include "imap-thread.h"
#endif
#include "timing.h"
#ifdef MAEMO
+#include <hildon-widgets/hildon-banner.h>
#include <hildon-widgets/hildon-program.h>
#include <gtk/gtkmain.h>
#include <libosso.h>
+#include <libgnomevfs/gnome-vfs-volume.h>
+#include <libgnomevfs/gnome-vfs-volume-monitor.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
-#define OSSO_EXAMPLE_NAME "claws-mail"
-#define OSSO_EXAMPLE_SERVICE "org.maemo."OSSO_EXAMPLE_NAME
-#define OSSO_EXAMPLE_OBJECT "/org/maemo/"OSSO_EXAMPLE_NAME
-#define OSSO_EXAMPLE_IFACE "org.maemo."OSSO_EXAMPLE_NAME
+#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 {
HildonWindow *window;
osso_context_t *osso_context;
};
+
+static GnomeVFSVolumeMonitor *volmon;
#endif
gchar *prog_version;
static MainWindow *static_mainwindow;
#ifdef MAEMO
-static HildonProgram *static_hildonprogram;
+static osso_context_t *static_osso_context;
+
void exit_event_handler(gboolean die_now, gpointer data)
{
AppData *appdata;
AppData *appdata;
appdata = (AppData *) data;
+ if (!strcmp(method, "top_application")) {
+ osso_rpc_free_val(retval);
+ return OSSO_OK;
+ }
osso_system_note_infoprint(appdata->osso_context, method, retval);
osso_rpc_free_val(retval);
g_usleep(50000);
}
+static gboolean sc_starting = FALSE;
+
static gboolean defer_check_all(void *data)
{
gboolean autochk = GPOINTER_TO_INT(data);
inc_all_account_mail(static_mainwindow, autochk,
prefs_common.newmail_notify_manu);
+ if (sc_starting) {
+ sc_starting = FALSE;
+ main_window_set_menu_sensitive(static_mainwindow);
+ toolbar_main_set_sensitive(static_mainwindow);
+ }
return FALSE;
}
{
inc_mail(static_mainwindow, prefs_common.newmail_notify_manu);
+ if (sc_starting) {
+ sc_starting = FALSE;
+ main_window_set_menu_sensitive(static_mainwindow);
+ toolbar_main_set_sensitive(static_mainwindow);
+ }
return FALSE;
}
static gboolean defer_jump(void *data)
{
- mainwindow_jump_to(data);
+ if (cmd.receive_all) {
+ defer_check_all(GINT_TO_POINTER(FALSE));
+ } else if (prefs_common.chk_on_startup) {
+ defer_check_all(GINT_TO_POINTER(TRUE));
+ } else if (cmd.receive) {
+ defer_check(NULL);
+ }
+ mainwindow_jump_to(data, FALSE);
+ if (sc_starting) {
+ sc_starting = FALSE;
+ main_window_set_menu_sensitive(static_mainwindow);
+ toolbar_main_set_sensitive(static_mainwindow);
+ }
return FALSE;
}
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 %s (or previous) found.\n"
+ gchar *message = g_strdup_printf(_("Configuration for %s found.\n"
"Do you want to migrate this configuration?"), oldversion);
+ gchar *message2 = g_strdup_printf(_("\n\nYour Sylpheed filtering rules can be converted by a\n"
+ "script available at %s."), TOOLS_URI);
+
+ if (!strcmp(oldversion, "Sylpheed"))
+ message = g_strconcat(message, message2, NULL);
+ g_free(message2);
+
gint r = 0;
GtkWidget *window = NULL;
GtkWidget *keep_backup_chk;
GTK_EVENTS_FLUSH();
r = copy_dir(old_cfg_dir, new_cfg_dir);
- gtk_widget_destroy(window);
+ label_window_destroy(window);
/* if copy failed, we'll remove the partially copied
* new directory */
GTK_EVENTS_FLUSH();
r = g_rename(old_cfg_dir, new_cfg_dir);
- gtk_widget_destroy(window);
+ label_window_destroy(window);
/* if g_rename failed, we'll try to copy */
if (r != 0) {
return (r == 0);
}
-static void migrate_common_rc(const gchar *old_rc, const gchar *new_rc)
+static int 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];
+ gboolean err = FALSE;
+
oldfp = g_fopen(old_rc, "r");
if (!oldfp)
- return;
+ return -1;
newfp = g_fopen(new_rc, "w");
if (!newfp) {
fclose(oldfp);
- return;
+ return -1;
}
plugin_path = g_strdup(get_plugin_dir());
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);
+ err |= (fputs(buf, newfp) == EOF);
} 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);
+ err |= (fputs(new_plugin_path, newfp) == EOF);
+ err |= (fputs(buf+strlen(old_plugin_path), newfp) == EOF);
}
}
g_free(plugin_path);
g_free(new_plugin_path);
g_free(old_plugin_path);
fclose(oldfp);
- fclose(newfp);
+ if (fclose(newfp) == EOF)
+ err = TRUE;
+
+ return (err ? -1:0);
}
#ifdef HAVE_LIBSM
#endif
static gboolean sc_exiting = FALSE;
-static gboolean sc_starting = FALSE;
static gboolean show_at_startup = TRUE;
+static gboolean claws_crashed_bool = FALSE;
+
+gboolean claws_crashed(void) {
+ return claws_crashed_bool;
+}
void main_set_show_at_startup(gboolean show)
{
show_at_startup = show;
}
+#ifdef MAEMO
+static void main_vol_mount_cb(GnomeVFSVolumeMonitor *vfs, GnomeVFSVolume *vol, MainWindow *mainwin)
+{
+ gchar *uri = gnome_vfs_volume_get_activation_uri (vol);
+ gchar *mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
+ g_free (uri);
+ if (mount_path) {
+ if(!strcmp(mount_path, prefs_common.data_root)) {
+ gtk_widget_set_sensitive(mainwin->window, TRUE);
+ inc_unlock();
+ }
+ }
+ g_free(mount_path);
+}
+static void main_vol_unmount_cb(GnomeVFSVolumeMonitor *vfs, GnomeVFSVolume *vol, MainWindow *mainwin)
+{
+ gchar *uri = gnome_vfs_volume_get_activation_uri (vol);
+ gchar *mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
+ g_free (uri);
+ if (mount_path) {
+ if(!strcmp(mount_path, prefs_common.data_root)) {
+ gtk_widget_set_sensitive(mainwin->window, FALSE);
+ inc_lock();
+ }
+ }
+ g_free(mount_path);
+}
+#endif
+
+#ifdef G_OS_WIN32
+static FILE* win32_debug_fp=NULL;
+static guint win32_log_handler_app_id;
+static guint win32_log_handler_glib_id;
+static guint win32_log_handler_gtk_id;
+
+static void win32_print_stdout(const gchar *string)
+{
+ if (win32_debug_fp) {
+ fprintf(win32_debug_fp, string);
+ fflush(win32_debug_fp);
+ }
+}
+
+static void win32_print_stderr(const gchar *string)
+{
+ if (win32_debug_fp) {
+ fprintf(win32_debug_fp, string);
+ fflush(win32_debug_fp);
+ }
+}
+
+static void win32_log(const gchar *log_domain, GLogLevelFlags log_level, const gchar* message, gpointer user_data)
+{
+ if (win32_debug_fp) {
+ const gchar* type;
+
+ switch(log_level & G_LOG_LEVEL_MASK)
+ {
+ case G_LOG_LEVEL_ERROR:
+ type="error";
+ break;
+ case G_LOG_LEVEL_CRITICAL:
+ type="critical";
+ break;
+ case G_LOG_LEVEL_WARNING:
+ type="warning";
+ break;
+ case G_LOG_LEVEL_MESSAGE:
+ type="message";
+ break;
+ case G_LOG_LEVEL_INFO:
+ type="info";
+ break;
+ case G_LOG_LEVEL_DEBUG:
+ type="debug";
+ break;
+ default:
+ type="N/A";
+ }
+ if (log_domain)
+ fprintf(win32_debug_fp, "%s: %s: %s", log_domain, type, message);
+ else
+ fprintf(win32_debug_fp, "%s: %s", type, message);
+ fflush(win32_debug_fp);
+ }
+}
+
+static void win32_open_log(void)
+{
+ if (is_file_exist("claws-win32.log")) {
+ if (rename_force("claws-win32.log", "claws-win32.log.bak") < 0)
+ FILE_OP_ERROR("claws-win32.log", "rename");
+ }
+ win32_debug_fp = fopen("claws-win32.log", "w");
+ if (win32_debug_fp)
+ {
+ g_set_print_handler(win32_print_stdout);
+ g_set_printerr_handler(win32_print_stdout);
+ win32_log_handler_app_id = g_log_set_handler(NULL, G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL
+ | G_LOG_FLAG_RECURSION, win32_log, NULL);
+ win32_log_handler_glib_id = g_log_set_handler("GLib", G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL
+ | G_LOG_FLAG_RECURSION, win32_log, NULL);
+ win32_log_handler_gtk_id = g_log_set_handler("Gtk", G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL
+ | G_LOG_FLAG_RECURSION, win32_log, NULL);
+ }
+}
+
+static void win32_close_log(void)
+{
+ if (win32_debug_fp)
+ {
+ g_log_remove_handler("", win32_log_handler_app_id);
+ g_log_remove_handler("GLib", win32_log_handler_glib_id);
+ g_log_remove_handler("Gtk", win32_log_handler_gtk_id);
+ fclose(win32_debug_fp);
+ win32_debug_fp=NULL;
+ }
+}
+#endif
+
int main(int argc, char *argv[])
{
#ifdef MAEMO
gboolean crash_file_present = FALSE;
gint num_folder_class = 0;
gboolean asked_for_migration = FALSE;
+ gboolean start_done = TRUE;
START_TIMING("startup");
sc_starting = TRUE;
+#ifdef G_OS_WIN32
+ win32_open_log();
+#endif
if (!claws_init(&argc, &argv)) {
+#ifdef G_OS_WIN32
+ win32_close_log();
+#endif
return 0;
}
- prefs_prepare_cache();
prog_version = PROG_VERSION;
argv0 = g_strdup(argv[0]);
parse_cmd_opt(argc, argv);
+ prefs_prepare_cache();
+
#ifdef CRASH_DIALOG
if (cmd.crash) {
gtk_set_locale();
gtk_init(&argc, &argv);
crash_main(cmd.crash_params);
+#ifdef G_OS_WIN32
+ win32_close_log();
+#endif
return 0;
}
crash_install_handlers();
gtk_init(&argc, &argv);
#ifdef MAEMO
- osso_context = osso_initialize(PACKAGE, VERSION, TRUE, NULL);
+ 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());
+ hildon_program = HILDON_PROGRAM(hildon_program_get_instance());
+ static_osso_context = osso_context;
#endif
gdk_rgb_init();
gtk_widget_set_default_colormap(gdk_rgb_get_colormap());
"currently available. This will cause "
"crashes. You need to upgrade GTK+ or "
"recompile Claws Mail."));
+#ifdef G_OS_WIN32
+ win32_close_log();
+#endif
exit(1);
}
#else
"currently available. This will cause "
"crashes. You need to recompile "
"Claws Mail."));
+#ifdef G_OS_WIN32
+ win32_close_log();
+#endif
exit(1);
}
#endif
gtk_rc_parse(userrc);
g_free(userrc);
+#ifdef G_OS_WIN32
+ CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_home_dir(), 1, win32_close_log(););
+#else
CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
+#endif
/* no config dir exists. See if we can migrate an old config. */
if (!is_dir_exist(RC_DIR)) {
* 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");
+ r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 2.6.0 (or older)"));
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");
+ r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.9.15 (or older)"));
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");
+ r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.0.5 (or older)"));
+ asked_for_migration = TRUE;
+ } else if (is_dir_exist(SYLPHEED_RC_DIR)) {
+ r = migrate_old_config(SYLPHEED_RC_DIR, RC_DIR, "Sylpheed");
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)
+ if (r == FALSE && !is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0) {
+#ifdef G_OS_WIN32
+ win32_close_log();
+#endif
exit(1);
}
+ }
if (!is_file_exist(RC_DIR G_DIR_SEPARATOR_S COMMON_RC) &&
gtk_accel_map_load (userrc);
g_free(userrc);
+#ifdef G_OS_WIN32
+ CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_rc_dir(), 1, win32_close_log(););
+#else
CHDIR_RETURN_VAL_IF_FAIL(get_rc_dir(), 1);
+#endif
MAKE_DIR_IF_NOT_EXIST(get_mail_base_dir());
MAKE_DIR_IF_NOT_EXIST(get_imap_cache_dir());
remove_all_files(get_tmp_dir());
remove_all_files(get_mime_tmp_dir());
+ if (!cmd.crash && crash_file_present)
+ claws_crashed_bool = TRUE;
+
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_DEBUG_FILTERING, "filtering.log");
+#ifdef G_OS_WIN32
+ CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_home_dir(), 1, win32_close_log(););
+#else
CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
+#endif
folder_system_init();
prefs_common_read_config();
prefs_logging_init();
prefs_receive_init();
prefs_send_init();
+ tags_read_tags();
#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);
-#endif
prefs_actions_read_config();
prefs_display_header_read_config();
/* prefs_filtering_read_config(); */
#ifdef MAEMO
AppData *appdata;
appdata = g_new0(AppData, 1);
- appdata->program = static_hildonprogram;
- appdata->window = mainwin->window;
+ appdata->program = hildon_program;
+ appdata->window = HILDON_WINDOW(mainwin->window);
appdata->osso_context = osso_context;
result = osso_rpc_set_cb_f(appdata->osso_context,
- OSSO_EXAMPLE_SERVICE,
- OSSO_EXAMPLE_OBJECT,
- OSSO_EXAMPLE_IFACE,
- dbus_req_handler, appdata);
+ OSSO_SERVICE,
+ OSSO_OBJECT,
+ OSSO_IFACE,
+ dbus_req_handler, appdata);
if (result != OSSO_OK) {
return OSSO_ERROR;
}
if (!run_wizard(mainwin, TRUE)) {
if (asked_for_migration)
remove_dir_recursive(RC_DIR);
+#ifdef G_OS_WIN32
+ win32_close_log();
+#endif
exit(1);
}
main_window_reflect_prefs_all_now();
if (!run_wizard(mainwin, FALSE)) {
if (asked_for_migration)
remove_dir_recursive(RC_DIR);
+#ifdef G_OS_WIN32
+ win32_close_log();
+#endif
exit(1);
}
- account_read_config_all();
if(!account_get_list()) {
exit_claws(mainwin);
+#ifdef G_OS_WIN32
+ win32_close_log();
+#endif
exit(1);
}
}
/* if crashed, show window early so that the user
* sees what's happening */
- if (!cmd.crash && crash_file_present)
+ if (claws_crashed())
main_window_popup(mainwin);
#ifdef HAVE_LIBETPAN
imap_main_init(prefs_common.skip_ssl_cert_check);
+ imap_main_set_timeout(prefs_common.io_timeout_secs);
#endif
account_set_missing_folder();
folder_set_missing_folders();
folder_func_to_all_folders(initial_processing, (gpointer *)mainwin);
/* if claws crashed, rebuild caches */
- if (!cmd.crash && crash_file_present) {
+ if (claws_crashed()) {
GTK_EVENTS_FLUSH();
debug_print("Claws Mail crashed, checking for new messages in local folders\n");
folder_item_update_thaw();
}
plugin_load_standard_plugins ();
-
+
/* if not crashed, show window now */
- if (!(!cmd.crash && crash_file_present)) {
+ if (!claws_crashed()) {
/* 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);
"external plugin. Please reinstall the "
"plugin and try again."));
exit_claws(mainwin);
+#ifdef G_OS_WIN32
+ win32_close_log();
+#endif
exit(1);
}
}
static_mainwindow = mainwin;
+#ifdef MAEMO
+ if (prefs_common.data_root != NULL && *prefs_common.data_root != '\0') {
+ GnomeVFSVolume *vol = NULL;
+ gchar *uri, *mount_path;
+
+ volmon = gnome_vfs_get_volume_monitor();
+ vol = gnome_vfs_volume_monitor_get_volume_for_path(volmon, prefs_common.data_root);
+
+ uri = gnome_vfs_volume_get_activation_uri (vol);
+ mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
+ g_free(uri);
+
+ if (vol == NULL || !gnome_vfs_volume_is_mounted(vol)
+ || strcmp(mount_path, prefs_common.data_root)) {
+ alertpanel_error(_("Claws Mail can not start without its data volume (%s)."),
+ prefs_common.data_root);
+ g_free(mount_path);
+ gnome_vfs_volume_unref(vol);
+ exit_claws(mainwin);
+ exit(1);
+ }
+ g_free(mount_path);
+ gnome_vfs_volume_unref(vol);
+ g_signal_connect(G_OBJECT(volmon),
+ "volume-mounted", G_CALLBACK(main_vol_mount_cb), mainwin);
+ g_signal_connect(G_OBJECT(volmon),
+ "volume-unmounted", G_CALLBACK(main_vol_unmount_cb), mainwin);
+ }
+#endif
+
#ifdef HAVE_STARTUP_NOTIFICATION
startup_notification_complete(FALSE);
#endif
gtk_clist_thaw(GTK_CLIST(mainwin->folderview->ctree));
main_window_cursor_normal(mainwin);
- if (cmd.receive_all) {
+ if (!cmd.target && prefs_common.goto_last_folder_on_startup &&
+ folder_find_item_from_identifier(prefs_common.last_opened_folder) != NULL &&
+ !claws_crashed()) {
+ cmd.target = prefs_common.last_opened_folder;
+ }
+
+ if (cmd.receive_all && !cmd.target) {
+ start_done = FALSE;
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 && !cmd.target) {
+ start_done = FALSE;
g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(TRUE));
- } else if (cmd.receive) {
+ } else if (cmd.receive && !cmd.target) {
+ start_done = FALSE;
g_timeout_add(1000, defer_check, NULL);
} else {
gtk_widget_grab_focus(folderview->ctree);
}
if (cmd.target) {
+ start_done = FALSE;
g_timeout_add(500, defer_jump, (gpointer)cmd.target);
}
compose_reopen_exit_drafts();
- sc_starting = FALSE;
+ if (start_done) {
+ sc_starting = FALSE;
+ main_window_set_menu_sensitive(mainwin);
+ toolbar_main_set_sensitive(mainwin);
+ }
END_TIMING();
gtk_main();
#ifdef MAEMO
osso_deinitialize(osso_context);
+#endif
+#ifdef G_OS_WIN32
+ win32_close_log();
#endif
exit_claws(mainwin);
return;
}
- if (item->opened)
+ if (item->opened) {
folder_item_close(item);
-
+ }
+
folder_item_free_cache(item, TRUE);
}
item = gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->folderview->ctree), mainwin->folderview->opened);
summary_save_prefs_to_folderitem(mainwin->folderview->summaryview, item);
+ prefs_common.last_opened_folder = folder_item_get_identifier(item);
}
/* save all state before exiting */
prefs_other_done();
prefs_receive_done();
prefs_send_done();
+ tags_write_tags();
#ifdef USE_ASPELL
prefs_spelling_done();
gtkaspell_checkers_quit();
cmd.send = TRUE;
} else if (!strncmp(argv[i], "--version", 9) ||
!strncmp(argv[i], "-v", 2)) {
- puts("Claws Mail version " VERSION);
+ g_print("Claws Mail version " VERSION "\n");
exit(0);
} else if (!strncmp(argv[i], "--status-full", 13)) {
const gchar *p = argv[i + 1];
g_print("%s\n", _(" --send send all queued messages"));
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"));
+ " 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 'folder/sub_folder'"));
g_print("%s\n", _(" --online switch to online mode"));
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_print("%s\n", _(" --alternate-config-dir [dir]\n"
+ " use specified configuration directory"));
g_free(base);
exit(1);
cmd.crash_params = g_strdup(argv[i + 1]);
i++;
} else if (!strncmp(argv[i], "--config-dir", sizeof "--config-dir" - 1)) {
- puts(RC_DIR);
+ g_print(RC_DIR "\n");
exit(0);
+ } else if (!strncmp(argv[i], "--alternate-config-dir", sizeof "--alternate-config-dir" - 1) && i+1 < argc) {
+ set_rc_dir(argv[i+1]);
} else if (!strncmp(argv[i], "--exit", 6) ||
!strncmp(argv[i], "--quit", 6) ||
!strncmp(argv[i], "-q", 2)) {
STATUSBAR_POP(mainwin);
}
-static void draft_all_messages(void)
+static gboolean draft_all_messages(void)
{
GList *compose_list = NULL;
compose_clear_exit_drafts();
- while ((compose_list = compose_get_compose_list()) != NULL) {
+ compose_list = compose_get_compose_list();
+ while (compose_list != NULL) {
Compose *c = (Compose*)compose_list->data;
- compose_draft(c, COMPOSE_DRAFT_FOR_EXIT);
- }
+ if (!compose_draft(c, COMPOSE_DRAFT_FOR_EXIT))
+ return FALSE;
+ compose_list = compose_get_compose_list();
+ }
+ return TRUE;
}
gboolean clean_quit(gpointer data)
{
sc_exiting = TRUE;
debug_print("exiting\n");
if (compose_get_compose_list()) {
- draft_all_messages();
+ if (!draft_all_messages()) {
+ main_window_popup(mainwin);
+ sc_exiting = FALSE;
+ return;
+ }
}
if (prefs_common.warn_queued_on_exit && procmsg_have_queued_mails_fast()) {
gchar *claws_get_socket_name(void)
{
static gchar *filename = NULL;
-
+ const gchar *socket_dir = NULL;
+
+ if (rc_dir_is_alt())
+ socket_dir = get_rc_dir();
+ else
+ socket_dir = g_get_tmp_dir();
if (filename == NULL) {
filename = g_strdup_printf("%s%cclaws-mail-%d",
- g_get_tmp_dir(), G_DIR_SEPARATOR,
+ socket_dir, G_DIR_SEPARATOR,
#if HAVE_GETUID
getuid());
#else
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",
+ g_print("Claws Mail is already running on display %s.\n",
buf);
} else {
fd_close(uxsock);
if (folders) g_ptr_array_free(folders, TRUE);
} else if (!strncmp(buf, "select ", 7)) {
const gchar *target = buf+7;
- mainwindow_jump_to(target);
+ mainwindow_jump_to(target, TRUE);
} else if (!strncmp(buf, "exit", 4)) {
app_will_exit(NULL, mainwin);
}
{
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) {
- gchar *tmp = g_strdup_printf(_("Some errors occurred "
+ alertpanel_error_log(_("Some errors occurred "
"while sending queued messages:\n%s"), 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.");
}
}
#ifdef MAEMO
-HildonProgram *hildon_program()
+osso_context_t *get_osso_context(void)
{
- return static_hildonprogram;
+ return static_osso_context;
}
#endif
projects / claws.git / blobdiff