Using the new icon

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

diff --git a/src/main.c b/src/main.c
index babcadc6b0cb9c9c043310c90379431d22572d51..f416276cece85054f5192f66cda93a919e94c059 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -20,8 +20,10 @@
  */
 
 #include "viking.h"
  */
 
 #include "viking.h"

+#include "icons/viking_icon.png_h"

 #include "mapcache.h"
 #include "background.h"
 #include "mapcache.h"
 #include "background.h"

+#include "curl_download.h"

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


@@ -74,13 +76,13 @@ static void open_window ( VikWindow *vw, const gchar **files )
   if ( newvw )
     while ( *files ) {
       vik_window_open_file ( newvw, *(files++), change_fn );
   if ( newvw )
     while ( *files ) {
       vik_window_open_file ( newvw, *(files++), change_fn );

-      files++;

     }
 }
 
 int main( int argc, char *argv[] )
 {
   VikWindow *first_window;
     }
 }
 
 int main( int argc, char *argv[] )
 {
   VikWindow *first_window;

+  GdkPixbuf *main_icon;

   gboolean dashdash_already = FALSE;
   int i = 0;
 
   gboolean dashdash_already = FALSE;
   int i = 0;
 


@@ -89,12 +91,21 @@ int main( int argc, char *argv[] )
 
   gtk_init (&argc, &argv);
 
 
   gtk_init (&argc, &argv);
 

+#ifdef HAVE_LIBCURL
+  curl_download_init();
+#endif
+

   /* Init modules/plugins */
   modules_init();
 
   a_mapcache_init ();
   a_background_init ();
 
   /* Init modules/plugins */
   modules_init();
 
   a_mapcache_init ();
   a_background_init ();
 

+  /* Set the icon */
+  main_icon = gdk_pixbuf_from_pixdata(&viking_18, FALSE, NULL);
+  gtk_window_set_default_icon(main_icon);
+
+  /* Create the first window */

   first_window = new_window();
 
   gdk_threads_enter ();
   first_window = new_window();
 
   gdk_threads_enter ();