Remove commented out code.

[geeqie.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 6b6456c..571a910 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,10 +47,8 @@
 #include "histogram.h"
 #include "pixbuf_util.h"
 
-#ifdef HAVE_LIBCHAMPLAIN
-#ifdef HAVE_LIBCHAMPLAIN_GTK
-#include <clutter-gtk/gtk-clutter-embed.h>
-#endif
+#ifdef HAVE_CLUTTER
+#include <clutter-gtk/clutter-gtk.h>
 #endif
 
 
@@ -125,20 +124,23 @@ 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));
                }
 }
 
 static void parse_command_line_add_dir(const gchar *dir, gchar **path, gchar **file,
                                       GList **list)
 {
+#if 0
+       /* This is broken because file filter is not initialized yet.
+       */
        GList *files;
        gchar *path_parsed;
        FileData *dir_fd;
 
        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))
@@ -164,6 +166,9 @@ static void parse_command_line_add_dir(const gchar *dir, gchar **path, gchar **f
 
        g_free(path_parsed);
        file_data_unref(dir_fd);
+#else
+       DEBUG_1("multiple directories specified, ignoring: %s", dir);
+#endif
 }
 
 static void parse_command_line_process_dir(const gchar *dir, gchar **path, gchar **file,
@@ -703,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);
@@ -714,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;
@@ -734,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);
@@ -753,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 */
@@ -771,12 +773,12 @@ gint main(gint argc, gchar *argv[])
 
        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
+#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
@@ -794,6 +796,10 @@ gint main(gint argc, gchar *argv[])
        DEBUG_1("%s main: pixbuf_inline_register_stock_icons", get_exec_time());         
        pixbuf_inline_register_stock_icons();
 
+       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);
 
@@ -811,8 +817,6 @@ 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());       
        if (!load_options(options))