Set image->windowing_data to NULL, unref the image. (Late merge from

2002-09-30  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkpixmap-win32.c (gdk_pixmap_impl_win32_finalize):
	Set image->windowing_data to NULL, unref the image. (Late merge
	from stable.)
This commit is contained in:
Tor Lillqvist 2002-09-30 20:33:24 +00:00 committed by Tor Lillqvist
parent d1d235adcb
commit 6b20187e0d
7 changed files with 40 additions and 0 deletions

View File

@ -1,3 +1,9 @@
2002-09-30 Tor Lillqvist <tml@iki.fi>
* 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 <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_set_mnemonic_widget):

View File

@ -1,3 +1,9 @@
2002-09-30 Tor Lillqvist <tml@iki.fi>
* 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 <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_set_mnemonic_widget):

View File

@ -1,3 +1,9 @@
2002-09-30 Tor Lillqvist <tml@iki.fi>
* 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 <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_set_mnemonic_widget):

View File

@ -1,3 +1,9 @@
2002-09-30 Tor Lillqvist <tml@iki.fi>
* 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 <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_set_mnemonic_widget):

View File

@ -1,3 +1,9 @@
2002-09-30 Tor Lillqvist <tml@iki.fi>
* 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 <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_set_mnemonic_widget):

View File

@ -1,3 +1,9 @@
2002-09-30 Tor Lillqvist <tml@iki.fi>
* 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 <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_set_mnemonic_widget):

View File

@ -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);
}