diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 9 | ||||
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/io-bmp.c | 2 | ||||
| -rw-r--r-- | gtk/gtkimage.c | 6 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 7 |
7 files changed, 36 insertions, 11 deletions
@@ -1,3 +1,12 @@ +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-08 Matthias Clasen <mclasen@redhat.com> * gtk/gtkimage.c (gtk_image_expose, gtk_image_calc_size): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 922ad44501..0964388419 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +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-08 Matthias Clasen <mclasen@redhat.com> * gtk/gtkimage.c (gtk_image_expose, gtk_image_calc_size): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 922ad44501..0964388419 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +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-08 Matthias Clasen <mclasen@redhat.com> * gtk/gtkimage.c (gtk_image_expose, gtk_image_calc_size): diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index f66a63cc31..effe56f213 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +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) + 2005-04-08 Matthias Clasen <mclasen@redhat.com> * io-pcx.c: No debugging output, please. (#173107, diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c index c754431fcf..ffde9ab123 100644 --- a/gdk-pixbuf/io-bmp.c +++ b/gdk-pixbuf/io-bmp.c @@ -1155,7 +1155,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 b512292779..e982cd08bd 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -1547,7 +1547,6 @@ gtk_image_expose (GtkWidget *widget, GdkBitmap *mask; GdkPixbuf *pixbuf; gboolean needs_state_transform; - GtkStockItem item; gchar *stock_id; @@ -1657,7 +1656,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; @@ -1957,7 +1956,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 @@ -1968,7 +1966,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 4bc6e3e9c2..44ecea206b 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); } |