X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/983bb64fcf20abf3445f82969c33a5e679ab5f3f..49bf732a4254dbe1a9a97a26c8923b073e061aa5:/src/main.c?ds=inline

diff --git a/src/main.c b/src/main.c
index 8b6263a4..e52636d1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -37,8 +37,12 @@
 void a_datasource_gc_init();
 #endif
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 
 #include <glib/gprintf.h>
 #include <glib/gi18n.h>
@@ -103,18 +107,23 @@ static VikWindow *new_window ()
 
 static void open_window ( VikWindow *vw, const gchar **files )
 {
-  VikWindow *newvw = new_window();
   gboolean change_fn = (!files[1]); /* only change fn if one file */
-  if ( newvw )
-    while ( *files ) {
-      vik_window_open_file ( newvw, *(files++), change_fn );
+  while ( *files ) {
+    // Only open a new window if a viking file
+    if (vw != NULL && check_file_magic_vik ( *(files) ) ) {
+      VikWindow *newvw = new_window();
+      if (newvw)
+	vik_window_open_file ( newvw, *(files++), change_fn );
+    }
+    else {
+      vik_window_open_file ( vw, *(files++), change_fn );
     }
+  }
 }
 
 /* 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 },
@@ -159,7 +168,7 @@ 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;
   }
 
@@ -207,5 +216,7 @@ int main( int argc, char *argv[] )
   a_dems_uninit ();
   a_preferences_uninit ();
 
+  curl_download_uninit();
+
   return 0;
 }