X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/94a036d4a43c07d86bc7cc3b0e8fb01ce5515647..e52d2bf31268501cb6c9dfecf0587002be3c6c02:/src/main.c?ds=sidebyside diff --git a/src/main.c b/src/main.c index d54381b2..1ed6f23e 100644 --- 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 @@ -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; }