X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/53c541719f55b571bbe2555ddc04b59ed9c42b5c..de2fc9aa9e8db8e0258c8328161c6b5eda176a0a:/src/main.c

diff --git a/src/main.c b/src/main.c
index 75d94f14..0c9e0324 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,22 +19,41 @@
  *
  */
 
+#ifdef HAVE_CONFIG
+#include "config.h"
+#endif /* HAVE_CONFIG */
+
 #include "viking.h"
-#include "icons/viking_icon.png_h"
+#include "icons/icons.h"
 #include "mapcache.h"
 #include "background.h"
 #include "dems.h"
 #include "curl_download.h"
+#include "preferences.h"
+#include "globals.h"
+
+#ifdef VIK_CONFIG_GEOCACHES
+void a_datasource_gc_init();
+#endif
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <glib/gprintf.h>
+#include <glib/gi18n.h>
 
 #include "modules.h"
 
 #define MAX_WINDOWS 1024
 
+/* FIXME LOCALEDIR must be configured by ./configure --localedir */
+/* But something does not work actually. */
+/* So, we need to redefine this variable on windows. */
+#ifdef WINDOWS
+#undef LOCALEDIR
+#define LOCALEDIR "locale"
+#endif
+
 static guint window_count = 0;
 
 static VikWindow *new_window ();
@@ -42,6 +61,14 @@ static void open_window ( VikWindow *vw, const gchar **files );
 static void destroy( GtkWidget *widget,
                      gpointer   data );
 
+/* Callback to mute log message */
+static void mute_log(const gchar *log_domain,
+                     GLogLevelFlags log_level,
+                     const gchar *message,
+                     gpointer user_data)
+{
+  /* Nothing to do, we just want to mute */
+}
 
 /* Another callback */
 static void destroy( GtkWidget *widget,
@@ -84,11 +111,11 @@ static void open_window ( VikWindow *vw, const gchar **files )
 }
 
 /* Options */
-static gboolean version = FALSE;
-
 static GOptionEntry entries[] = 
 {
-  { "version", 'v', 0, G_OPTION_ARG_NONE, &version, "Show version", NULL },
+  { "debug", 'd', 0, G_OPTION_ARG_NONE, &vik_debug, N_("Enable debug output"), NULL },
+  { "verbose", 'V', 0, G_OPTION_ARG_NONE, &vik_verbose, N_("Enable verbose output"), NULL },
+  { "version", 'v', 0, G_OPTION_ARG_NONE, &vik_version, N_("Show version"), NULL },
   { NULL }
 };
 
@@ -100,6 +127,10 @@ int main( int argc, char *argv[] )
   int i = 0;
   GError *error = NULL;
   gboolean gui_initialized;
+	
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);  
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
 
   g_thread_init ( NULL );
   gdk_threads_init ();
@@ -124,24 +155,33 @@ int main( int argc, char *argv[] )
     return EXIT_FAILURE;
   }
    
-  if (version)
+  if (vik_version)
   {
     g_printf ("%s %s, Copyright (c) 2003-2007 Evan Battaglia\n", PACKAGE_NAME, PACKAGE_VERSION);
     return EXIT_SUCCESS;
   }
 
+  if (!vik_debug)
+    g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, mute_log, NULL);
+
   curl_download_init();
 
+  a_preferences_init ();
+
+  a_vik_preferences_init ();
+
   /* Init modules/plugins */
   modules_init();
 
   a_mapcache_init ();
   a_background_init ();
-  vik_layer_cursors_init ();
-  vik_window_cursors_init ();
+
+#ifdef VIK_CONFIG_GEOCACHES
+  a_datasource_gc_init();
+#endif
 
   /* Set the icon */
-  main_icon = gdk_pixbuf_from_pixdata(&viking_icon, FALSE, NULL);
+  main_icon = gdk_pixbuf_from_pixdata(&viking_icon_pixbuf, FALSE, NULL);
   gtk_window_set_default_icon(main_icon);
 
   /* Create the first window */
@@ -160,8 +200,7 @@ int main( int argc, char *argv[] )
 
   a_mapcache_uninit ();
   a_dems_uninit ();
-  vik_layer_cursors_uninit ();
-  vik_window_cursors_uninit ();
+  a_preferences_uninit ();
 
   return 0;
 }