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 5bbd022736ee2021dbe49892cbc13113c5cb9774..7aafb44e10fdd6e510e324c001b7323c85052b5f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -31,6 +31,7 @@
 #include "curl_download.h"
 #include "preferences.h"
 #include "globals.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();


@@ -113,7 +114,6 @@ static void open_window ( VikWindow *vw, const gchar **files )
 /* Options */
 static GOptionEntry entries[] = 
 {
 /* Options */
 static GOptionEntry entries[] = 
 {

-  { "small_waypoint", 's', 0, G_OPTION_ARG_NONE, &vik_use_small_wp_icons, N_("Use smaller symbols for waypoints"), 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 },
   { "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 },


@@ -165,16 +165,17 @@ int main( int argc, char *argv[] )
   if (!vik_debug)
     g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, mute_log, NULL);
 
   if (!vik_debug)
     g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, mute_log, NULL);
 

-  a_download_init();
-  curl_download_init();
-

   a_preferences_init ();
 
   a_vik_preferences_init ();
 
   a_preferences_init ();
 
   a_vik_preferences_init ();
 

+  a_download_init();
+  curl_download_init();
+

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

+  maps_layer_init ();

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