0.9.6claws32

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index ea62599606b9ddb748dc3f517f5f6cb30a06bd36..272f0aaf942d3c7d6f1b1ff52c6103c82f960627 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -51,6 +51,8 @@
 #include "prefs_common.h"
 #include "prefs_account.h"
 #include "prefs_actions.h"
+#include "prefs_fonts.h"
+#include "prefs_spelling.h"
 #include "scoring.h"
 #include "prefs_display_header.h"
 #include "account.h"
@@ -72,7 +74,8 @@
 #include "plugin.h"
 
 #if USE_GPGME
-#  include "rfc2015.h"
+#  include "sgpgme.h"
+#  include "pgpmime.h"
 #endif
 #if USE_OPENSSL
 #  include "ssl.h"
@@ -115,10 +118,6 @@ static struct RemoteCmd {
 
 static void parse_cmd_opt(int argc, char *argv[]);
 
-#if USE_GPGME
-static void idle_function_for_gpgme(void);
-#endif /* USE_GPGME */
-
 static gint prohibit_duplicate_launch  (void);
 static gchar * get_crashfile_name      (void);
 static gint lock_socket_remove         (void);
@@ -248,31 +247,14 @@ int main(int argc, char *argv[])
        prefs_common_read_config();
 
 #if USE_GPGME
-       gpg_started = FALSE;
-       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 (prefs_common.gpg_warning) {
-                       AlertValue val;
-
-                       val = alertpanel_message_with_disable
-                               (_("Warning"),
-                                _("GnuPG is not installed properly, or needs to be upgraded.\n"
-                                  "OpenPGP support disabled."));
-                       if (val & G_ALERTDISABLE)
-                               prefs_common.gpg_warning = FALSE;
-               }
-       } else
-               gpg_started = TRUE;
-
-       gpgme_register_idle(idle_function_for_gpgme);
+       sgpgme_init();
+       pgpmime_init();
 #endif
 
+       prefs_fonts_init();
 #ifdef USE_ASPELL
        gtkaspell_checkers_init();
+       prefs_spelling_init();
 #endif
        
        sock_set_io_timeout(prefs_common.io_timeout_secs);
@@ -331,8 +313,12 @@ int main(int argc, char *argv[])
        /* ignore SIGPIPE signal for preventing sudden death of program */
        signal(SIGPIPE, SIG_IGN);
 
-       if (cmd.receive_all || prefs_common.chk_on_startup)
-               inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
+       if (cmd.receive_all)
+               inc_all_account_mail(mainwin, FALSE, 
+                                    prefs_common.newmail_notify_manu);
+       else if (prefs_common.chk_on_startup)
+               inc_all_account_mail(mainwin, TRUE, 
+                                    prefs_common.newmail_notify_manu);
        else if (cmd.receive)
                inc_mail(mainwin, prefs_common.newmail_notify_manu);
        else
@@ -374,7 +360,14 @@ int main(int argc, char *argv[])
 
        addressbook_destroy();
 
+#ifdef USE_GPGME
+       pgpmime_done();
+       sgpgme_done();
+#endif
+
+       prefs_fonts_done();
 #ifdef USE_ASPELL       
+       prefs_spelling_done();
        gtkaspell_checkers_quit();
 #endif
        sylpheed_done();
@@ -610,10 +603,6 @@ void app_will_exit(GtkWidget *widget, gpointer data)
 
        inc_autocheck_timer_remove();
 
-#if USE_GPGME
-        gpgmegtk_free_passphrase();
-#endif
-
        if (prefs_common.clean_on_exit)
                main_window_empty_trash(mainwin, prefs_common.ask_on_clean);
 
@@ -659,14 +648,6 @@ void app_will_exit(GtkWidget *widget, gpointer data)
        gtk_main_quit();
 }
 
-#if USE_GPGME
-static void idle_function_for_gpgme(void)
-{
-       while (gtk_events_pending())
-               gtk_main_iteration();
-}
-#endif /* USE_GPGME */
-
 /*
  * CLAWS: want this public so crash dialog can delete the
  * lock file too
@@ -836,7 +817,8 @@ static void lock_socket_input_cb(gpointer data,
        if (!strncmp(buf, "popup", 5)) {
                main_window_popup(mainwin);
        } else if (!strncmp(buf, "receive_all", 11)) {
-               inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
+               inc_all_account_mail(mainwin, FALSE,
+                                    prefs_common.newmail_notify_manu);
        } else if (!strncmp(buf, "receive", 7)) {
                inc_mail(mainwin, prefs_common.newmail_notify_manu);
        } else if (!strncmp(buf, "compose_attach", 14)) {