Merge from 2.4:

Wed May  5 22:20:21 2004  Matthias Clasen  <maclas@gmx.de>

	Merge from 2.4:

	* gtk/gtkiconfactory.c (icon_source_clear): Don't
	call g_free() on a pixbuf.  (#141961, Crispin Flowerday)
This commit is contained in:
Matthias Clasen 2004-05-06 02:42:04 +00:00 committed by Matthias Clasen
parent 7a15a4065f
commit 4ec2a42a4e
5 changed files with 30 additions and 1 deletions

View File

@ -1,3 +1,10 @@
Wed May 5 22:20:21 2004 Matthias Clasen <maclas@gmx.de>
Merge from 2.4:
* gtk/gtkiconfactory.c (icon_source_clear): Don't
call g_free() on a pixbuf. (#141961, Crispin Flowerday)
2004-05-05 Matthias Clasen <mclasen@redhat.com>
Merge from 2.4:

View File

@ -1,3 +1,10 @@
Wed May 5 22:20:21 2004 Matthias Clasen <maclas@gmx.de>
Merge from 2.4:
* gtk/gtkiconfactory.c (icon_source_clear): Don't
call g_free() on a pixbuf. (#141961, Crispin Flowerday)
2004-05-05 Matthias Clasen <mclasen@redhat.com>
Merge from 2.4:

View File

@ -1,3 +1,10 @@
Wed May 5 22:20:21 2004 Matthias Clasen <maclas@gmx.de>
Merge from 2.4:
* gtk/gtkiconfactory.c (icon_source_clear): Don't
call g_free() on a pixbuf. (#141961, Crispin Flowerday)
2004-05-05 Matthias Clasen <mclasen@redhat.com>
Merge from 2.4:

View File

@ -1,3 +1,10 @@
Wed May 5 22:20:21 2004 Matthias Clasen <maclas@gmx.de>
Merge from 2.4:
* gtk/gtkiconfactory.c (icon_source_clear): Don't
call g_free() on a pixbuf. (#141961, Crispin Flowerday)
2004-05-05 Matthias Clasen <mclasen@redhat.com>
Merge from 2.4:

View File

@ -2091,7 +2091,8 @@ icon_source_clear (GtkIconSource *source)
case GTK_ICON_SOURCE_FILENAME:
g_free (source->source.filename);
source->source.filename = NULL;
g_free (source->filename_pixbuf);
if (source->filename_pixbuf)
g_object_unref (source->filename_pixbuf);
source->filename_pixbuf = NULL;
break;
case GTK_ICON_SOURCE_PIXBUF: