Commit 1c9d02b4 authored by Kristian Rietveld's avatar Kristian Rietveld Committed by Kristian Rietveld

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).
parent eccc733f
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,
......
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,
......
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,
......
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,
......
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,
......
......@@ -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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment