[gcompris] No more use binreloc on windows, it is useless.



commit eceba83999d4209f318f504e8bedf35f1405f5d4
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Tue Oct 6 22:42:15 2009 +0200

    No more use binreloc on windows, it is useless.
    Added an error message about why we fail to load the first pixmap.
    This is very usefull to know why we fail especialy if the gnome pixbuf
    loader is missing.

 config.h.mingw.in       |    2 +-
 src/gcompris/gcompris.c |   13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/config.h.mingw.in b/config.h.mingw.in
index c568119..6c647e6 100644
--- a/config.h.mingw.in
+++ b/config.h.mingw.in
@@ -140,4 +140,4 @@
 #define USE_SDLMIXER
 
 /* Use binary relocation */
-#define ENABLE_BINRELOC 1
+#define ENABLE_BINRELOC 0
diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c
index d4208a5..9ff1251 100644
--- a/src/gcompris/gcompris.c
+++ b/src/gcompris/gcompris.c
@@ -668,19 +668,18 @@ static void setup_window ()
    * ------------------------
    */
   icon_file = g_strconcat(properties->system_icon_dir, "/gcompris.png", NULL);
-  if (!g_file_test (icon_file, G_FILE_TEST_EXISTS)) {
-      /* Now check if this file is on the net */
-      icon_file = gc_net_get_url_from_file("gcompris.png", NULL);
-  }
 
   if(!icon_file)
       g_warning ("Couldn't find file %s !", icon_file);
 
-  icon_pixbuf = gdk_pixbuf_new_from_file(icon_file,NULL);
+  GError *error = NULL;
+  icon_pixbuf = gdk_pixbuf_new_from_file(icon_file, &error);
   if (!icon_pixbuf)
     {
-      g_warning ("Failed to load pixbuf file: %s\n",
-               icon_file);
+      g_warning ("Failed to load pixbuf file: %s / %s\n",
+		 icon_file, error->message);
+      g_error_free (error);
+
     }
   g_free(icon_file);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]