Add ability to turn off Garmin GPS after transfer.

[andy/viking.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index d1b5fc9234b8589339f1d861fa1c9934b14a9413..7aafb44e10fdd6e510e324c001b7323c85052b5f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -30,6 +30,8 @@
 #include "dems.h"
 #include "curl_download.h"
 #include "preferences.h"
 #include "dems.h"
 #include "curl_download.h"
 #include "preferences.h"

+#include "globals.h"
+#include "vikmapslayer.h"

 
 #ifdef VIK_CONFIG_GEOCACHES
 void a_datasource_gc_init();
 
 #ifdef VIK_CONFIG_GEOCACHES
 void a_datasource_gc_init();


@@ -45,6 +47,14 @@ void a_datasource_gc_init();
 
 #define MAX_WINDOWS 1024
 
 
 #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 ();
 static guint window_count = 0;
 
 static VikWindow *new_window ();


@@ -148,28 +158,33 @@ int main( int argc, char *argv[] )
    
   if (vik_version)
   {
    
   if (vik_version)
   {

-    g_printf ("%s %s, Copyright (c) 2003-2007 Evan Battaglia\n", PACKAGE_NAME, PACKAGE_VERSION);
+    g_printf ("%s %s, Copyright (c) 2003-2008 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);
 
     return EXIT_SUCCESS;
   }
 
   if (!vik_debug)
     g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, mute_log, NULL);
 

+  a_preferences_init ();
+
+  a_vik_preferences_init ();
+
+  a_download_init();

   curl_download_init();
 
   /* Init modules/plugins */
   modules_init();
 
   curl_download_init();
 
   /* Init modules/plugins */
   modules_init();
 

+  maps_layer_init ();

   a_mapcache_init ();
   a_background_init ();
   a_mapcache_init ();
   a_background_init ();

-  a_preferences_init ();

 
 #ifdef VIK_CONFIG_GEOCACHES
   a_datasource_gc_init();
 #endif
 
   /* Set the icon */
 
 #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_pixbuf, FALSE, NULL);

   gtk_window_set_default_icon(main_icon);
 
   /* Create the first window */
   gtk_window_set_default_icon(main_icon);
 
   /* Create the first window */


@@ -186,6 +201,7 @@ int main( int argc, char *argv[] )
   gtk_main ();
   gdk_threads_leave ();
 
   gtk_main ();
   gdk_threads_leave ();
 

+  a_background_uninit ();

   a_mapcache_uninit ();
   a_dems_uninit ();
   a_preferences_uninit ();
   a_mapcache_uninit ();
   a_dems_uninit ();
   a_preferences_uninit ();