Don't display too many broken images. (#169870, Roman Kagan, patch by Ivan

2005-04-09  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose):
	Don't display too many broken images.  (#169870, Roman
	Kagan, patch by Ivan Wong)

	* gtk/gtkwidget.c (gtk_widget_unparent): Remove debugging
	output.  (#300013, Tommi Komulainen)

	* io-bmp.c (gdk_pixbuf__bmp_image_save_to_callback):
	Don't overflow the stack.  (Jakub Jelinek, Arjan van de Ven)

7 files changed, 34 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index e02f48ba9b..15a67a671d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2005-04-09  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
+	Don't display too many broken images.  (#169870, Roman
+	Kagan, patch by Ivan Wong)
+
+	* gtk/gtkwidget.c (gtk_widget_unparent): Remove debugging
+	output.  (#300013, Tommi Komulainen)
+
+2005-04-09  Matthias Clasen  <mclasen@redhat.com>
+
 	* configure.in: Bump version
 
 	* === Released 2.6.5 ===
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e02f48ba9b..15a67a671d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,14 @@
 2005-04-09  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
+	Don't display too many broken images.  (#169870, Roman
+	Kagan, patch by Ivan Wong)
+
+	* gtk/gtkwidget.c (gtk_widget_unparent): Remove debugging
+	output.  (#300013, Tommi Komulainen)
+
+2005-04-09  Matthias Clasen  <mclasen@redhat.com>
+
 	* configure.in: Bump version
 
 	* === Released 2.6.5 ===
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e02f48ba9b..15a67a671d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,14 @@
 2005-04-09  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
+	Don't display too many broken images.  (#169870, Roman
+	Kagan, patch by Ivan Wong)
+
+	* gtk/gtkwidget.c (gtk_widget_unparent): Remove debugging
+	output.  (#300013, Tommi Komulainen)
+
+2005-04-09  Matthias Clasen  <mclasen@redhat.com>
+
 	* configure.in: Bump version
 
 	* === Released 2.6.5 ===
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 9d665fc0df..b49dc3536c 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-09  Matthias Clasen  <mclasen@redhat.com>
 
+	* io-bmp.c (gdk_pixbuf__bmp_image_save_to_callback): 
+	Don't overflow the stack.  (Jakub Jelinek, Arjan van de Ven)
+
 	* === Released 2.6.5 ===
 
 2005-04-08  Matthias Clasen  <mclasen@redhat.com>
diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c
index f7be00469d..ae67b7b9ad 100644
--- a/gdk-pixbuf/io-bmp.c
+++ b/gdk-pixbuf/io-bmp.c
@@ -1171,7 +1171,7 @@ gdk_pixbuf__bmp_image_save_to_callback (GdkPixbufSaveFunc   save_func,
 					GError            **error)
 {
 	guint width, height, channel, size, stride, src_stride, x, y;
-	guchar BFH_BIH[40], *pixels, *buf, *src, *dst, *dst_line;
+	guchar BFH_BIH[54], *pixels, *buf, *src, *dst, *dst_line;
 	gboolean ret;
 
 	width = gdk_pixbuf_get_width (pixbuf);
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 9de4a86606..0f2c9e3241 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1545,7 +1545,6 @@ gtk_image_expose (GtkWidget      *widget,
       GdkBitmap *mask;
       GdkPixbuf *pixbuf;
       gboolean needs_state_transform;
-      GtkStockItem item;
       gchar *stock_id;
 	  
       
@@ -1655,7 +1654,7 @@ gtk_image_expose (GtkWidget      *widget,
           break;
 
         case GTK_IMAGE_STOCK:
-	  if (gtk_stock_lookup (image->data.stock.stock_id, &item))
+	  if (gtk_style_lookup_icon_set (widget->style, image->data.stock.stock_id))
 	    stock_id = image->data.stock.stock_id;
 	  else
 	    stock_id = GTK_STOCK_MISSING_IMAGE;
@@ -1955,7 +1954,6 @@ gtk_image_calc_size (GtkImage *image)
 {
   GtkWidget *widget = GTK_WIDGET (image);
   GdkPixbuf *pixbuf = NULL;
-  GtkStockItem item;
   gchar *stock_id;
   
   /* We update stock/icon set on every size request, because
@@ -1966,7 +1964,7 @@ gtk_image_calc_size (GtkImage *image)
   switch (image->storage_type)
     {
     case GTK_IMAGE_STOCK:
-      if (gtk_stock_lookup (image->data.stock.stock_id, &item))
+      if (gtk_style_lookup_icon_set (widget->style, image->data.stock.stock_id))
 	stock_id = image->data.stock.stock_id;
       else
 	stock_id = GTK_STOCK_MISSING_IMAGE;
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 3533db7bea..da55ec0ca3 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1901,12 +1901,7 @@ gtk_widget_unparent (GtkWidget *widget)
   if (GTK_WIDGET_REALIZED (widget)) 
     {
       if (GTK_WIDGET_IN_REPARENT (widget))
-#if 1
-	{
-	  g_print ("unmapping!\n");
-	  gtk_widget_unmap (widget);
-	}
-#endif
+	gtk_widget_unmap (widget);
       else
 	gtk_widget_unrealize (widget);
     }