X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/50a14534a51f892500ee82f867e8ab2f85b936ae..51c15f41e0c686a58c8e8e082f7485e3102199db:/src/main.c

diff --git a/src/main.c b/src/main.c
index 09497d3e..1ed6f23e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,11 +20,16 @@
  */
 
 #include "viking.h"
+#include "icons/viking_icon.png_h"
 #include "mapcache.h"
 #include "background.h"
+#include "dems.h"
+#include "curl_download.h"
 
 #include <string.h>
 
+#include "modules.h"
+
 #define MAX_WINDOWS 1024
 
 static guint window_count = 0;
@@ -72,13 +77,13 @@ static void open_window ( VikWindow *vw, const gchar **files )
   if ( newvw )
     while ( *files ) {
       vik_window_open_file ( newvw, *(files++), change_fn );
-      files++;
     }
 }
 
 int main( int argc, char *argv[] )
 {
   VikWindow *first_window;
+  GdkPixbuf *main_icon;
   gboolean dashdash_already = FALSE;
   int i = 0;
 
@@ -87,9 +92,19 @@ int main( int argc, char *argv[] )
 
   gtk_init (&argc, &argv);
 
+  curl_download_init();
+
+  /* Init modules/plugins */
+  modules_init();
+
   a_mapcache_init ();
   a_background_init ();
 
+  /* Set the icon */
+  main_icon = gdk_pixbuf_from_pixdata(&viking_icon, FALSE, NULL);
+  gtk_window_set_default_icon(main_icon);
+
+  /* Create the first window */
   first_window = new_window();
 
   gdk_threads_enter ();
@@ -103,8 +118,8 @@ int main( int argc, char *argv[] )
   gtk_main ();
   gdk_threads_leave ();
 
-  a_clipboard_uninit ();
   a_mapcache_uninit ();
+  a_dems_uninit ();
 
   return 0;
 }