X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/65c1e0b03ad3fa552f965ace461be98ebd4e9fc1..405b74ed000c226b3c8cde5709d8b2c55c0d787c:/src/main.c

diff --git a/src/main.c b/src/main.c
index 81cd6ea3..49499e47 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,6 +31,7 @@
 #include "curl_download.h"
 #include "preferences.h"
 #include "globals.h"
+#include "vikmapslayer.h"
 
 #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[] = 
 {
-  { "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 },
@@ -158,22 +158,24 @@ int main( int argc, char *argv[] )
    
   if (vik_version)
   {
-    g_printf ("%s %s, Copyright (c) 2003-2008 Evan Battaglia\n", PACKAGE_NAME, PACKAGE_VERSION);
+    g_printf ("%s %s\nCopyright (c) 2003-2008 Evan Battaglia\nCopyright (c) 2008-2010 Viking's contributors\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 ();
 
+  a_download_init();
+  curl_download_init();
+
   /* Init modules/plugins */
   modules_init();
 
+  maps_layer_init ();
   a_mapcache_init ();
   a_background_init ();
 
@@ -204,5 +206,7 @@ int main( int argc, char *argv[] )
   a_dems_uninit ();
   a_preferences_uninit ();
 
+  curl_download_uninit();
+
   return 0;
 }