#include <sys/types.h>
#include <signal.h>
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
#if USE_GPGME
# include <gpgme.h>
# include "passphrase.h"
#endif
+#include "sylpheed.h"
#include "intl.h"
#include "main.h"
#include "mainwindow.h"
#include "setup.h"
#include "utils.h"
#include "gtkutils.h"
+#include "log.h"
+#include "prefs_toolbar.h"
#if USE_GPGME
# include "rfc2015.h"
#endif
-#if USE_SSL
+#if USE_OPENSSL
# include "ssl.h"
#endif
gchar *prog_version;
gchar *startup_dir;
+#ifdef CRASH_DIALOG
gchar *argv0;
-gboolean debug_mode = FALSE;
+#endif
static gint lock_socket = -1;
static gint lock_socket_tag = 0;
MainWindow *mainwin;
FolderView *folderview;
- setlocale(LC_ALL, "");
- bindtextdomain(PACKAGE, LOCALEDIR);
- textdomain(PACKAGE);
+ if(!sylpheed_init(&argc, &argv)) {
+ return 0;
+ }
prog_version = PROG_VERSION;
startup_dir = g_get_current_dir();
+#ifdef CRASH_DIALOG
argv0 = g_strdup(argv[0]);
+#endif
parse_cmd_opt(argc, argv);
- gtk_set_locale();
- gtk_init(&argc, &argv);
-
+#ifdef CRASH_DIALOG
if (cmd.crash) {
+ gtk_set_locale();
+ gtk_init(&argc, &argv);
crash_main(cmd.crash_params);
return 0;
}
-
crash_install_handlers();
+#endif
+
+ /* check and create unix domain socket */
+ lock_socket = prohibit_duplicate_launch();
+ if (lock_socket < 0) return 0;
+
+ if (cmd.status) {
+ puts("0 Sylpheed not running.");
+ return 0;
+ }
+
+ gtk_set_locale();
+ gtk_init(&argc, &argv);
#if USE_THREADS || USE_LDAP
g_thread_init(NULL);
gtk_widget_push_colormap(gdk_imlib_get_colormap());
#endif
-#if USE_SSL
- ssl_init();
-#endif
-
- srandom((gint)time(NULL));
-
/* parse gtkrc files */
userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc",
NULL);
CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
- /* check and create unix domain socket */
- lock_socket = prohibit_duplicate_launch();
- if (lock_socket < 0) return 0;
-
- if (cmd.status) {
- puts("0 Sylpheed not running.");
- return 0;
- }
-
- /* backup if old rc file exists */
- if (is_file_exist(RC_DIR)) {
- if (rename(RC_DIR, RC_DIR ".bak") < 0)
- FILE_OP_ERROR(RC_DIR, "rename");
- }
MAKE_DIR_IF_NOT_EXIST(RC_DIR);
MAKE_DIR_IF_NOT_EXIST(get_imap_cache_dir());
MAKE_DIR_IF_NOT_EXIST(get_news_cache_dir());
MAKE_DIR_IF_NOT_EXIST(get_tmp_dir());
MAKE_DIR_IF_NOT_EXIST(RC_DIR G_DIR_SEPARATOR_S "uidl");
- if (is_file_exist(RC_DIR G_DIR_SEPARATOR_S "sylpheed.log")) {
- if (rename(RC_DIR G_DIR_SEPARATOR_S "sylpheed.log",
- RC_DIR G_DIR_SEPARATOR_S "sylpheed.log.bak") < 0)
- FILE_OP_ERROR("sylpheed.log", "rename");
- }
set_log_file(RC_DIR G_DIR_SEPARATOR_S "sylpheed.log");
- if (is_file_exist(RC_DIR G_DIR_SEPARATOR_S "assortrc") &&
- !is_file_exist(RC_DIR G_DIR_SEPARATOR_S "filterrc")) {
- if (rename(RC_DIR G_DIR_SEPARATOR_S "assortrc",
- RC_DIR G_DIR_SEPARATOR_S "filterrc") < 0)
- FILE_OP_ERROR(RC_DIR G_DIR_SEPARATOR_S "assortrc",
- "rename");
- }
-
prefs_common_init();
prefs_common_read_config();
#if USE_GPGME
gpg_started = FALSE;
- if (gpgme_check_engine()) { /* Also does some gpgme init */
+ if (gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP) !=
+ GPGME_No_Error) { /* Also does some gpgme init */
rfc2015_disable_all();
debug_print("gpgme_engine_version:\n%s\n",
gpgme_get_engine_info());
/* if Sylpheed crashed, rebuild caches */
if (!cmd.crash && is_file_exist(get_crashfile_name())) {
- debug_print("Sylpheed crashed, checking for new messages\n");
- folderview_check_new_all();
+ debug_print("Sylpheed crashed, checking for new messages in local folders\n");
+ folderview_check_new(NULL);
}
/* make the crash-indicator file */
str_write_to_file("foo", get_crashfile_name());
main_window_toggle_work_offline(mainwin, TRUE);
if (cmd.online_mode == ONLINE_MODE_ONLINE)
main_window_toggle_work_offline(mainwin, FALSE);
+
+ prefs_toolbar_init();
static_mainwindow = mainwin;
gtk_main();
+ prefs_toolbar_done();
+
addressbook_destroy();
#if USE_ASPELL
gtkaspell_checkers_delete();
#endif
+ sylpheed_done();
return 0;
}
gint i;
for (i = 1; i < argc; i++) {
- if (!strncmp(argv[i], "--debug", 7))
- debug_mode = TRUE;
- else 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))
cmd.receive = TRUE;
if (!cmd.crash)
unlink(get_crashfile_name());
-#if USE_SSL
- ssl_done();
-#endif
-
gtk_main_quit();
}
} else if (!strncmp(buf, "offline", 7)) {
main_window_toggle_work_offline(mainwin, TRUE);
} else if (!strncmp(buf, "status", 6)) {
- guint new, unread, total;
+ guint new, unread, unreadmarked, total;
- folder_count_total_msgs(&new, &unread, &total);
- g_snprintf(buf, sizeof(buf), "%d %d %d\n", new, unread, 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(sock, buf, strlen(buf));
}
if (procmsg_send_queue
(folder->queue, prefs_common.savemsg) < 0)
alertpanel_error(_("Some errors occurred while sending queued messages."));
- statusbar_pop_all();
folder_item_scan(folder->queue);
if (prefs_common.savemsg && folder->outbox) {
- folder_update_item(folder->outbox, TRUE);
if (folder->outbox == def_outbox)
def_outbox = NULL;
}
}
}
-
- if (prefs_common.savemsg && def_outbox)
- folder_update_item(def_outbox, TRUE);
}
projects / claws.git / blobdiff