Ensure vtl created in acquire operation runs post read stage.

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

diff --git a/src/main.c b/src/main.c
index 8150ec01eeae2551bf4e60ec7838debb2c96ad64..af9ea4c5f37bbf8cf8a70b41c21cb3244708166a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -28,15 +28,22 @@
 #include "mapcache.h"
 #include "background.h"
 #include "dems.h"
 #include "mapcache.h"
 #include "background.h"
 #include "dems.h"

+#include "babel.h"

 #include "curl_download.h"
 #include "preferences.h"
 #include "curl_download.h"
 #include "preferences.h"

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

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

+#ifdef HAVE_STDLIB_H

 #include <stdlib.h>
 #include <stdlib.h>

+#endif
+#ifdef HAVE_STRING_H

 #include <string.h>
 #include <string.h>

+#endif

 
 #include <glib/gprintf.h>
 #include <glib/gi18n.h>
 
 #include <glib/gprintf.h>
 #include <glib/gi18n.h>


@@ -56,7 +63,7 @@ void a_datasource_gc_init();
 static guint window_count = 0;
 
 static VikWindow *new_window ();
 static guint window_count = 0;
 
 static VikWindow *new_window ();

-static void open_window ( VikWindow *vw, const gchar **files );
+static void open_window ( VikWindow *vw, GSList *files );

 static void destroy( GtkWidget *widget,
                      gpointer   data );
 
 static void destroy( GtkWidget *widget,
                      gpointer   data );
 


@@ -99,14 +106,25 @@ static VikWindow *new_window ()
   return NULL;
 }
 
   return NULL;
 }
 

-static void open_window ( VikWindow *vw, const gchar **files )
+static void open_window ( VikWindow *vw, GSList *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 );
+  gboolean change_fn = (g_slist_length(files) == 1); /* only change fn if one file */
+  GSList *cur_file = files;
+  while ( cur_file ) {
+    // Only open a new window if a viking file
+    gchar *file_name = cur_file->data;
+    if (vw != NULL && check_file_magic_vik ( file_name ) ) {
+      VikWindow *newvw = new_window();
+      if (newvw)
+       vik_window_open_file ( newvw, file_name, change_fn );
+    }
+    else {
+      vik_window_open_file ( vw, file_name, change_fn );

     }
     }

+    g_free (file_name);
+    cur_file = g_slist_next (cur_file);
+  }
+  g_slist_free (files);

 }
 
 /* Options */
 }
 
 /* Options */


@@ -156,28 +174,35 @@ 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\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);
 
     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();
 
   curl_download_init();
 

+  a_babel_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 ();

-  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 */


@@ -194,9 +219,14 @@ int main( int argc, char *argv[] )
   gtk_main ();
   gdk_threads_leave ();
 
   gtk_main ();
   gdk_threads_leave ();
 

+  a_babel_uninit ();
+
+  a_background_uninit ();

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

+  curl_download_uninit();
+

   return 0;
 }
   return 0;
 }