diff --git a/ChangeLog b/ChangeLog index cf6e31a4c9..22a48b67ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-09-30 Tor Lillqvist + + * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_impl_win32_finalize): + Set image->windowing_data to NULL, unref the image. (Late merge + from stable.) + Mon Sep 30 15:45:49 2002 Owen Taylor * gtk/gtklabel.c (gtk_label_set_mnemonic_widget): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cf6e31a4c9..22a48b67ff 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2002-09-30 Tor Lillqvist + + * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_impl_win32_finalize): + Set image->windowing_data to NULL, unref the image. (Late merge + from stable.) + Mon Sep 30 15:45:49 2002 Owen Taylor * gtk/gtklabel.c (gtk_label_set_mnemonic_widget): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index cf6e31a4c9..22a48b67ff 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2002-09-30 Tor Lillqvist + + * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_impl_win32_finalize): + Set image->windowing_data to NULL, unref the image. (Late merge + from stable.) + Mon Sep 30 15:45:49 2002 Owen Taylor * gtk/gtklabel.c (gtk_label_set_mnemonic_widget): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index cf6e31a4c9..22a48b67ff 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2002-09-30 Tor Lillqvist + + * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_impl_win32_finalize): + Set image->windowing_data to NULL, unref the image. (Late merge + from stable.) + Mon Sep 30 15:45:49 2002 Owen Taylor * gtk/gtklabel.c (gtk_label_set_mnemonic_widget): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index cf6e31a4c9..22a48b67ff 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2002-09-30 Tor Lillqvist + + * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_impl_win32_finalize): + Set image->windowing_data to NULL, unref the image. (Late merge + from stable.) + Mon Sep 30 15:45:49 2002 Owen Taylor * gtk/gtklabel.c (gtk_label_set_mnemonic_widget): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cf6e31a4c9..22a48b67ff 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2002-09-30 Tor Lillqvist + + * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_impl_win32_finalize): + Set image->windowing_data to NULL, unref the image. (Late merge + from stable.) + Mon Sep 30 15:45:49 2002 Owen Taylor * gtk/gtklabel.c (gtk_label_set_mnemonic_widget): diff --git a/gdk/win32/gdkpixmap-win32.c b/gdk/win32/gdkpixmap-win32.c index f467ca95b5..6971566f14 100644 --- a/gdk/win32/gdkpixmap-win32.c +++ b/gdk/win32/gdkpixmap-win32.c @@ -101,6 +101,7 @@ gdk_pixmap_impl_win32_finalize (GObject *object) { GdkPixmapImplWin32 *impl = GDK_PIXMAP_IMPL_WIN32 (object); GdkPixmap *wrapper = GDK_PIXMAP (GDK_DRAWABLE_IMPL_WIN32 (impl)->wrapper); + GdkImage *image = impl->image; GDK_NOTE (PIXMAP, g_print ("gdk_pixmap_impl_win32_finalize: %p\n", GDK_PIXMAP_HBITMAP (wrapper))); @@ -110,6 +111,9 @@ gdk_pixmap_impl_win32_finalize (GObject *object) gdk_win32_handle_table_remove (GDK_PIXMAP_HBITMAP (wrapper)); + image->windowing_data = NULL; + g_object_unref (image); + G_OBJECT_CLASS (parent_class)->finalize (object); }