"fix" crash dialog (other problems appear)

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index da4b15f2a3466cd1b02f91cc4d18d79075f01a9c..9b655675b17905293f3a6bf266d4f4dd62463677 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -41,15 +41,12 @@
 #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"
@@ -73,11 +70,12 @@
 #include "setup.h"
 #include "utils.h"
 #include "gtkutils.h"
+#include "log.h"
 
 #if USE_GPGME
 #  include "rfc2015.h"
 #endif
-#if USE_SSL
+#if USE_OPENSSL
 #  include "ssl.h"
 #endif
 
@@ -87,8 +85,9 @@
 
 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;
@@ -165,16 +164,26 @@ int main(int argc, char *argv[])
        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);
 
+#ifdef CRASH_DIALOG
+       if (cmd.crash) {
+               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;
@@ -187,14 +196,6 @@ int main(int argc, char *argv[])
        gtk_set_locale();
        gtk_init(&argc, &argv);
 
-#ifdef CRASH_DIALOG
-       if (cmd.crash) {
-               crash_main(cmd.crash_params);
-               return 0;
-       }
-       crash_install_handlers();
-#endif
-
 #if USE_THREADS || USE_LDAP
        g_thread_init(NULL);
        if (!g_thread_supported())
@@ -207,12 +208,6 @@ int main(int argc, char *argv[])
        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);
@@ -234,11 +229,6 @@ int main(int argc, char *argv[])
 
        CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
 
-       /* 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());
@@ -246,11 +236,6 @@ int main(int argc, char *argv[])
        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");
 
        prefs_common_init();
@@ -258,7 +243,8 @@ int main(int argc, char *argv[])
 
 #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());
@@ -329,8 +315,8 @@ int main(int argc, char *argv[])
 
        /* 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());
@@ -382,7 +368,7 @@ static void parse_cmd_opt(int argc, char *argv[])
 
        for (i = 1; i < argc; i++) {
                if (!strncmp(argv[i], "--debug", 7))
-                       debug_mode = TRUE;
+                       debug_set_mode(TRUE);
                else if (!strncmp(argv[i], "--receive-all", 13))
                        cmd.receive_all = TRUE;
                else if (!strncmp(argv[i], "--receive", 9))
@@ -604,7 +590,7 @@ void app_will_exit(GtkWidget *widget, gpointer data)
        if (!cmd.crash)
                unlink(get_crashfile_name());
 
-#if USE_SSL
+#if USE_OPENSSL
        ssl_done();
 #endif