new filtering

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 40e945a687a894b0f5020bb44fdaae86d6a6b3a3..f4168faa4ea837ae2aef7ff0b11d167122bc1a97 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -57,6 +57,8 @@
 #include "prefs_common.h"
 #include "prefs_filter.h"
 #include "prefs_account.h"
+#include "scoring.h"
+#include "prefs_display_header.h"
 #include "account.h"
 #include "procmsg.h"
 #include "inc.h"
@@ -70,6 +72,10 @@
 #include "utils.h"
 #include "gtkutils.h"
 
+#if USE_GPGME
+#include "rfc2015.h"
+#endif /* USE_GPGME */
+
 gchar *prog_version;
 gchar *startup_dir;
 gboolean debug_mode = FALSE;
@@ -203,8 +209,17 @@ int main(int argc, char *argv[])
                rfc2015_disable_all();
                debug_print("gpgme_engine_version:\n%s\n",
                            gpgme_get_engine_info());
-               alertpanel_warning(_("GnuPG is not installed properly.\n"
-                                    "OpenPGP support disabled."));
+
+               if (prefs_common.gpgme_warning) {
+                       AlertValue v = alertpanel_message_with_disable
+                               (_("Warning"),
+                                _("GnuPG is not installed properly.\n"
+                                  "OpenPGP support disabled."));
+                       if (v & G_ALERTDISABLE) {
+                               prefs_common.gpgme_warning = FALSE;
+                               prefs_common_save_config();
+                       }
+               }
        }
        gpgme_register_idle(idle_function_for_gpgme);
 #endif
@@ -213,6 +228,10 @@ int main(int argc, char *argv[])
        prefs_common_save_config();
        prefs_filter_read_config();
        prefs_filter_write_config();
+       prefs_display_header_read_config();
+       prefs_display_header_write_config();
+       prefs_scoring_read_config();
+       prefs_filtering_read_config();
 
        gtkut_widget_init();
 
@@ -233,9 +252,11 @@ int main(int argc, char *argv[])
        account_set_missing_folder();
        folderview_set(folderview);
 
-       if (cmd.receive_all)
+       inc_autocheck_timer_init(mainwin);
+
+       if (cmd.receive_all || prefs_common.chk_on_startup)
                inc_all_account_mail(mainwin);
-       else if (prefs_common.chk_on_startup || cmd.receive)
+       else if (cmd.receive)
                inc_mail(mainwin);
        else
                gtk_widget_grab_focus(folderview->ctree);