mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-24 12:41:16 +00:00
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:
parent
7a15a4065f
commit
4ec2a42a4e
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user