Trim trailing white spaces.

[geeqie.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index d78a801..ab5ded3 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -19,6 +19,7 @@
 #ifdef G_OS_UNIX
 #include <pwd.h>
 #endif
+#include <locale.h>
 
 #include "main.h"
 
@@ -46,11 +47,9 @@
 #include "histogram.h"
 #include "pixbuf_util.h"
 
-#ifdef HAVE_LIBCHAMPLAIN
-#ifdef HAVE_LIBCHAMPLAIN_GTK
+#ifdef HAVE_CLUTTER
 #include <clutter-gtk/clutter-gtk.h>
 #endif
-#endif
 
 
 gboolean thumb_format_changed = FALSE;
@@ -125,7 +124,7 @@ static void parse_command_line_add_file(const gchar *file_path, gchar **path, gc
                {
                if (!*path) *path = remove_level_from_path(path_parsed);
                if (!*file) *file = g_strdup(path_parsed);
-               *list = g_list_prepend(*list, file_data_new_simple(path_parsed));
+               *list = g_list_prepend(*list, file_data_new_group(path_parsed));
                }
 }
 
@@ -141,7 +140,7 @@ static void parse_command_line_add_dir(const gchar *dir, gchar **path, gchar **f
 
        path_parsed = g_strdup(dir);
        parse_out_relatives(path_parsed);
-       dir_fd = file_data_new_simple(path_parsed);
+       dir_fd = file_data_new_dir(path_parsed);
        
 
        if (filelist_read(dir_fd, &files, NULL))
@@ -699,7 +698,7 @@ void exit_program(void)
        exit_program_final();
 }
 
-/* This code is supposed to handle situation when a file mmaped by image_loader 
+/* This code is supposed to handle situation when a file mmaped by image_loader
  * or by exif loader is truncated by some other process.
  * This is probably not completely correct according to posix, because
  * mmap is not in the list of calls that can be used safely in signal handler,
@@ -709,7 +708,7 @@ void exit_program(void)
  */
 /* FIXME: this probably needs some better ifdefs. Please report any compilation problems */
 
-#ifdef SIGBUS
+#if defined(SIGBUS) && defined(SA_SIGINFO)
 static void sigbus_handler_cb(int signum, siginfo_t *info, void *context)
 {
        unsigned long pagesize = sysconf(_SC_PAGE_SIZE);
@@ -720,7 +719,7 @@ static void sigbus_handler_cb(int signum, siginfo_t *info, void *context)
 
 static void setup_sigbus_handler(void)
 {
-#ifdef SIGBUS
+#if defined(SIGBUS) && defined(SA_SIGINFO)
        struct sigaction sigbus_action;
        sigfillset(&sigbus_action.sa_mask);
        sigbus_action.sa_sigaction = sigbus_handler_cb;
@@ -740,13 +739,14 @@ gint main(gint argc, gchar *argv[])
        g_thread_init(NULL);
        gdk_threads_init();
        gdk_threads_enter();
+
 #endif
        
        /* init execution time counter (debug only) */
        init_exec_time();
 
        /* setup locale, i18n */
-       gtk_set_locale();
+       setlocale(LC_ALL, "");
 
 #ifdef ENABLE_NLS
        bindtextdomain(PACKAGE, GQ_LOCALEDIR);
@@ -759,10 +759,6 @@ gint main(gint argc, gchar *argv[])
        /* setup random seed for random slideshow */
        srand(time(NULL));
 
-#if 1
-       log_printf("%s %s, This is a beta release.\n", GQ_APPNAME, VERSION);
-#endif
-
        setup_sigbus_handler();
 
        /* register global notify functions */
@@ -776,13 +772,13 @@ gint main(gint argc, gchar *argv[])
        gtkrc_load();
 
        parse_command_line_for_debug_option(argc, argv);
-       DEBUG_1("%s main: gtk_init", get_exec_time());   
-#ifdef HAVE_LIBCHAMPLAIN
-#ifdef HAVE_LIBCHAMPLAIN_GTK
-       gtk_clutter_init(&argc, &argv);
-#else
-       gtk_init(&argc, &argv);
-#endif
+       DEBUG_1("%s main: gtk_init", get_exec_time());
+#ifdef HAVE_CLUTTER
+       if (gtk_clutter_init(&argc, &argv) != CLUTTER_INIT_SUCCESS)
+               {
+               log_printf("Can't initialize clutter-gtk.\n");
+               exit(1);
+               }
 #else
        gtk_init(&argc, &argv);
 #endif
@@ -797,13 +793,17 @@ gint main(gint argc, gchar *argv[])
                log_printf("!!! %s may quit unexpectedly with a relocation error.\n", GQ_APPNAME);
                }
 
-       DEBUG_1("%s main: pixbuf_inline_register_stock_icons", get_exec_time());         
+       DEBUG_1("%s main: pixbuf_inline_register_stock_icons", get_exec_time());
        pixbuf_inline_register_stock_icons();
 
-       DEBUG_1("%s main: parse_command_line", get_exec_time());         
+       DEBUG_1("%s main: setting default options before commandline handling", get_exec_time());
+       options = init_options(NULL);
+       setup_default_options(options);
+
+       DEBUG_1("%s main: parse_command_line", get_exec_time());
        parse_command_line(argc, argv);
 
-       DEBUG_1("%s main: mkdir_if_not_exists", get_exec_time());        
+       DEBUG_1("%s main: mkdir_if_not_exists", get_exec_time());
        /* these functions don't depend on config file */
        mkdir_if_not_exists(get_rc_dir());
        mkdir_if_not_exists(get_collections_dir());
@@ -817,19 +817,17 @@ gint main(gint argc, gchar *argv[])
 
        /* restore session from the config file */
 
-       options = init_options(NULL);
-       setup_default_options(options);
 
-       DEBUG_1("%s main: load_options", get_exec_time());       
+       DEBUG_1("%s main: load_options", get_exec_time());
        if (!load_options(options))
                {
                /* load_options calls these functions after it parses global options, we have to call it here if it fails */
                filter_add_defaults();
-               filter_rebuild(); 
+               filter_rebuild();
                }
 
        /* handle missing config file and commandline additions*/
-       if (!layout_window_list) 
+       if (!layout_window_list)
                {
                /* broken or no config file */
                layout_new_from_config(NULL, NULL, TRUE);
@@ -914,7 +912,7 @@ gint main(gint argc, gchar *argv[])
        remote_connection = remote_server_init(buf, cd);
        g_free(buf);
        
-       DEBUG_1("%s main: gtk_main", get_exec_time());   
+       DEBUG_1("%s main: gtk_main", get_exec_time());
        gtk_main();
 #ifdef HAVE_GTHREAD
        gdk_threads_leave();