#include "tags.h"
#ifdef HAVE_LIBETPAN
#include "imap-thread.h"
+#include "nntp-thread.h"
#endif
#include "stock_pixmap.h"
#ifdef HAVE_VALGRIND
#include "valgrind.h"
#endif
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
# include "ssl.h"
#endif
#include "timing.h"
#ifdef MAEMO
+#ifdef CHINOOK
+#include <hildon/hildon-banner.h>
+#include <hildon/hildon-program.h>
+#else
+#include <hildon-widgets/hildon-banner.h>
#include <hildon-widgets/hildon-program.h>
+#endif
#include <gtk/gtkmain.h>
#include <libosso.h>
#include <libgnomevfs/gnome-vfs-volume.h>
gchar *prog_version;
gchar *argv0;
+#ifdef MAEMO
+HildonProgram *hildon_program;
+#endif
+
#ifdef HAVE_STARTUP_NOTIFICATION
static SnLauncheeContext *sn_context = NULL;
static SnDisplay *sn_display = NULL;
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)
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;
}
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;
}
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 crash_file_present = FALSE;
gint num_folder_class = 0;
gboolean asked_for_migration = FALSE;
+ gboolean start_done = TRUE;
START_TIMING("startup");
return 0;
}
- prefs_prepare_cache();
+ debug_print("GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version,
+ glib_major_version, glib_minor_version, glib_micro_version);
+ debug_print("Compiled-in features:\n");
+#if HAVE_LIBCOMPFACE
+ debug_print(" compface\n");
+#endif
+#if USE_ASPELL
+ debug_print(" aspell\n");
+#endif
+#if USE_GNUTLS
+ debug_print(" gnutls\n");
+#endif
+#if INET6
+ debug_print(" ipv6\n");
+#endif
+#if HAVE_ICONV
+ debug_print(" iconv\n");
+#endif
+#if USE_JPILOT
+ debug_print(" jpilot\n");
+#endif
+#if USE_LDAP
+ debug_print(" ldap\n");
+#endif
+#if HAVE_LIBETPAN
+ debug_print(" libetpan %d.%d\n", LIBETPAN_VERSION_MAJOR, LIBETPAN_VERSION_MINOR);
+#endif
+#if USE_GNOMEPRINT
+ debug_print(" gnomeprint\n");
+#endif
+#if HAVE_LIBSM
+ debug_print(" libsm\n");
+#endif
+#if USE_OPENSSL
+ debug_print(" openssl\n");
+#endif
+
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();
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();
prefs_display_header_read_config();
/* prefs_filtering_read_config(); */
addressbook_read_file();
- renderer_read_config();
gtkut_widget_init();
stock_pixbuf_gdk(NULL, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
#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_SERVICE,
return OSSO_ERROR;
}
+#ifndef CHINOOK
/* Add handler for Exit D-BUS messages */
result = osso_application_set_exit_cb(appdata->osso_context,
exit_event_handler,
if (result != OSSO_OK) {
return OSSO_ERROR;
}
+#endif
#endif
manage_window_focus_in(mainwin->window, NULL, NULL);
folderview = mainwin->folderview;
#endif
exit(1);
}
- account_read_config_all();
if(!account_get_list()) {
exit_claws(mainwin);
#ifdef G_OS_WIN32
#ifdef HAVE_LIBETPAN
imap_main_init(prefs_common.skip_ssl_cert_check);
imap_main_set_timeout(prefs_common.io_timeout_secs);
+ nntp_main_init(prefs_common.skip_ssl_cert_check);
#endif
account_set_missing_folder();
folder_set_missing_folders();
}
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 && !cmd.target) {
+ start_done = FALSE;
g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(TRUE));
} 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 HAVE_LIBETPAN
imap_main_done();
+ nntp_main_done();
#endif
/* delete crashfile */
if (!cmd.crash)
prefs_message_done();
prefs_other_done();
prefs_receive_done();
+ prefs_logging_done();
prefs_send_done();
tags_write_tags();
#ifdef USE_ASPELL
cmd.send = TRUE;
} else if (!strncmp(argv[i], "--version", 9) ||
!strncmp(argv[i], "-v", 2)) {
- g_print("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)) {
- g_print(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)) {
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
}
}
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 if (error) {
alertpanel_error_log("Some errors occurred "
"while sending queued messages.");
}
#ifdef MAEMO
-HildonProgram *hildon_program(void)
-{
- return static_hildonprogram;
-}
osso_context_t *get_osso_context(void)
{
return static_osso_context;
projects / claws.git / blobdiff