diff --git a/ChangeLog b/ChangeLog
index 7ffb9b6b99..660a498b58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May  5 22:23:59 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* 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>
 
 	* gtk/gtkuimanager.c (print_node): Make the output 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7ffb9b6b99..660a498b58 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed May  5 22:23:59 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* 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>
 
 	* gtk/gtkuimanager.c (print_node): Make the output 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7ffb9b6b99..660a498b58 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed May  5 22:23:59 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* 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>
 
 	* gtk/gtkuimanager.c (print_node): Make the output 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7ffb9b6b99..660a498b58 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed May  5 22:23:59 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* 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>
 
 	* gtk/gtkuimanager.c (print_node): Make the output 
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 37fa891892..b0486ab57b 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -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: