Hide Expedia view mode when expedia is not built in.

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

diff --git a/src/main.c b/src/main.c
index d54381b2e3d6638f1908751a78022c6554499a74..1ed6f23e065152b815d2b6cadb44855ca26e256b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -20,9 +20,10 @@
  */
 
 #include "viking.h"
-#include "icons/viking_18.png_h"
+#include "icons/viking_icon.png_h"
 #include "mapcache.h"
 #include "background.h"
+#include "dems.h"
 #include "curl_download.h"
 
 #include <string.h>
@@ -91,9 +92,7 @@ int main( int argc, char *argv[] )
 
   gtk_init (&argc, &argv);
 
-#ifdef HAVE_LIBCURL
   curl_download_init();
-#endif
 
   /* Init modules/plugins */
   modules_init();
@@ -102,7 +101,7 @@ int main( int argc, char *argv[] )
   a_background_init ();
 
   /* Set the icon */
-  main_icon = gdk_pixbuf_from_pixdata(&viking_18, FALSE, NULL);
+  main_icon = gdk_pixbuf_from_pixdata(&viking_icon, FALSE, NULL);
   gtk_window_set_default_icon(main_icon);
 
   /* Create the first window */
@@ -120,6 +119,7 @@ int main( int argc, char *argv[] )
   gdk_threads_leave ();
 
   a_mapcache_uninit ();
+  a_dems_uninit ();
 
   return 0;
 }