remove all gtk3 conditionals

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 631e366f6a98b24bc99059f6a10ba179bf1dead2..eff8f86090dcec4a99436dc8b525e3038eb968fe 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -132,7 +132,7 @@
 #include "advsearch.h"
 #include "avatars.h"
 #include "passwordstore.h"
-#include "claws_io.h"
+#include "file-utils.h"
 
 #ifdef HAVE_LIBETPAN
 #include "imap-thread.h"
@@ -1032,9 +1032,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 +1065,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 +1112,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();
 
@@ -1440,7 +1434,7 @@ int main(int argc, char *argv[])
                folder_item_update_freeze();
        }
        /* make the crash-indicator file */
-       str_write_to_file("foo", get_crashfile_name());
+       str_write_to_file("foo", get_crashfile_name(), FALSE);
 
        inc_autocheck_timer_init(mainwin);