contiunue the fix for check-at-startup, eade694613c19ffe747ccb77466070e474e3f968

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 0f170165932f04f812498b9ec5e865e8e8e3876c..bdbdc66263ce3b1671553a0a4a5ec710b72c2664 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -317,10 +317,14 @@ static gboolean defer_check_all(void *data)
 {
        gboolean autochk = GPOINTER_TO_INT(data);
 
-       inc_all_account_mail(static_mainwindow, autochk, 
+       if (!sc_starting) {
+               inc_all_account_mail(static_mainwindow, autochk, FALSE,
                        prefs_common.newmail_notify_manu);
 
-       if (sc_starting) {
+       } else {
+               inc_all_account_mail(static_mainwindow, FALSE,
+                               prefs_common.chk_on_startup,
+                               prefs_common.newmail_notify_manu);
                sc_starting = FALSE;
                main_window_set_menu_sensitive(static_mainwindow);
                toolbar_main_set_sensitive(static_mainwindow);
@@ -1032,9 +1036,7 @@ int main(int argc, char *argv[])
 
 #ifdef CRASH_DIALOG
        if (cmd.crash) {
-#if !GTK_CHECK_VERSION(3, 0, 0)
                gtk_set_locale();
-#endif
                gtk_init(&argc, &argv);
                crash_main(cmd.crash_params);
 #ifdef G_OS_WIN32
@@ -1067,9 +1069,7 @@ int main(int argc, char *argv[])
 
        reset_statistics();
        
-#if !GTK_CHECK_VERSION(3, 0, 0)
        gtk_set_locale();
-#endif
        gtk_init(&argc, &argv);
 
 #ifdef G_OS_WIN32
@@ -1116,11 +1116,9 @@ int main(int argc, char *argv[])
        }
 #endif
 
-#if !GTK_CHECK_VERSION(3, 0, 0)
        gtk_widget_set_default_colormap(
                gdk_screen_get_system_colormap(
                        gdk_screen_get_default()));
-#endif
 
        gtkut_create_ui_manager();
 
@@ -2544,7 +2542,7 @@ static void lock_socket_input_cb(gpointer data,
        } else if (!strncmp(buf, "get_display", 11)) {
                fd_write_all(sock, x_display, strlen(x_display));
        } else if (!strncmp(buf, "receive_all", 11)) {
-               inc_all_account_mail(mainwin, FALSE,
+               inc_all_account_mail(mainwin, FALSE, FALSE,
                                     prefs_common.newmail_notify_manu);
        } else if (!strncmp(buf, "receive", 7)) {
                inc_mail(mainwin, prefs_common.newmail_notify_manu);