Merge from stable.

Wed Sep  3 21:58:03 2003  Kristian Rietveld  <kris@gtk.org>

	Merge from stable.

	* gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL,
	unref it. (Fixes memleak, patch from Kjartan Maraas).
This commit is contained in:
Kristian Rietveld 2003-09-03 20:05:04 +00:00 committed by Kristian Rietveld
parent eccc733f29
commit 1c9d02b48d
6 changed files with 38 additions and 0 deletions

View File

@ -1,3 +1,10 @@
Wed Sep 3 21:58:03 2003 Kristian Rietveld <kris@gtk.org>
Merge from stable.
* gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL,
unref it. (Fixes memleak, patch from Kjartan Maraas).
Wed Sep 3 21:38:26 2003 Kristian Rietveld <kris@gtk.org>
* gdk/Makefile.am, gdk/linux-fb/gdkfbmanager.c, gdk/x11/gdkcolor-x11.c,

View File

@ -1,3 +1,10 @@
Wed Sep 3 21:58:03 2003 Kristian Rietveld <kris@gtk.org>
Merge from stable.
* gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL,
unref it. (Fixes memleak, patch from Kjartan Maraas).
Wed Sep 3 21:38:26 2003 Kristian Rietveld <kris@gtk.org>
* gdk/Makefile.am, gdk/linux-fb/gdkfbmanager.c, gdk/x11/gdkcolor-x11.c,

View File

@ -1,3 +1,10 @@
Wed Sep 3 21:58:03 2003 Kristian Rietveld <kris@gtk.org>
Merge from stable.
* gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL,
unref it. (Fixes memleak, patch from Kjartan Maraas).
Wed Sep 3 21:38:26 2003 Kristian Rietveld <kris@gtk.org>
* gdk/Makefile.am, gdk/linux-fb/gdkfbmanager.c, gdk/x11/gdkcolor-x11.c,

View File

@ -1,3 +1,10 @@
Wed Sep 3 21:58:03 2003 Kristian Rietveld <kris@gtk.org>
Merge from stable.
* gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL,
unref it. (Fixes memleak, patch from Kjartan Maraas).
Wed Sep 3 21:38:26 2003 Kristian Rietveld <kris@gtk.org>
* gdk/Makefile.am, gdk/linux-fb/gdkfbmanager.c, gdk/x11/gdkcolor-x11.c,

View File

@ -1,3 +1,10 @@
Wed Sep 3 21:58:03 2003 Kristian Rietveld <kris@gtk.org>
Merge from stable.
* gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL,
unref it. (Fixes memleak, patch from Kjartan Maraas).
Wed Sep 3 21:38:26 2003 Kristian Rietveld <kris@gtk.org>
* gdk/Makefile.am, gdk/linux-fb/gdkfbmanager.c, gdk/x11/gdkcolor-x11.c,

View File

@ -2522,6 +2522,9 @@ cached_icon_free (CachedIcon *icon)
{
g_object_unref (icon->pixbuf);
if (icon->style)
g_object_unref (icon->style);
g_free (icon);
}