/*
* Geeqie
* (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
#ifdef G_OS_UNIX
#include <pwd.h>
#endif
+#include <locale.h>
#include "main.h"
#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;
{
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));
}
}
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))
*/
/* 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);
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;
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);
/* 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 */
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
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);
/* 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))