new filtering action : forward - some fixes

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 7173d119a8c9c60b4927577850f7d30daa007f25..5c80e9460f59367e0d8b748c821fdd2cf98920f8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -72,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;
@@ -135,6 +139,8 @@ int main(int argc, char *argv[])
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
 
+       parse_cmd_opt(argc, argv);
+
        gtk_set_locale();
        gtk_init(&argc, &argv);
 
@@ -172,7 +178,7 @@ int main(int argc, char *argv[])
        prog_version = PROG_VERSION;
        startup_dir = g_get_current_dir();
 
-       parse_cmd_opt(argc, argv);
+       /*      parse_cmd_opt(argc, argv); */
 
        CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
 
@@ -227,6 +233,7 @@ int main(int argc, char *argv[])
        prefs_display_header_read_config();
        prefs_display_header_write_config();
        prefs_scoring_read_config();
+       prefs_filtering_read_config();
 
        gtkut_widget_init();
 
@@ -437,7 +444,7 @@ static void lock_socket_input_cb(gpointer data,
        gchar buf[BUFFSIZE];
 
        sock = fd_accept(source);
-       fd_read(sock, buf, sizeof(buf));
+       fd_gets(sock, buf, sizeof(buf));
        fd_close(sock);
 
        if (!strncmp(buf, "popup", 5)){