# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1043605434 0
# Node ID f2be5cd8262fc7c9d6c7cdad8072be510d6c2259
# Parent  c057b532bd92f8d0c487a09973fad19abf946647
gtkutil.c (update_frame_tool_bar): Call prepare_image_for_display
  and handle image load failure (invalid pixmap).

diff -r c057b532bd92 -r f2be5cd8262f src/ChangeLog
--- a/src/ChangeLog	Sun Jan 26 18:04:55 2003 +0000
+++ b/src/ChangeLog	Sun Jan 26 18:23:54 2003 +0000
@@ -1,3 +1,8 @@
+2003-01-26  Jan D.  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (update_frame_tool_bar): Call prepare_image_for_display
+	and handle image load failure.
+
 2003-01-26  Jason Rumney  <jasonr@gnu.org>
 
 	* w32fns.c (init_jpeg_functions, jpeg_resync_to_restart_wrapper):
diff -r c057b532bd92 -r f2be5cd8262f src/gtkutil.c
--- a/src/gtkutil.c	Sun Jan 26 18:04:55 2003 +0000
+++ b/src/gtkutil.c	Sun Jan 26 18:23:54 2003 +0000
@@ -2740,7 +2740,14 @@
 
       img_id = lookup_image (f, image);
       img = IMAGE_FROM_ID (f, img_id);
-
+      prepare_image_for_display (f, img);
+
+      if (img->load_failed_p || img->pixmap == None)
+        {
+          if (wicon) gtk_widget_hide (wicon);
+          continue;
+        }
+          
       if (! wicon)
         {
           GdkPixmap *gpix = gdk_pixmap_foreign_new (img->pixmap);