Free the GError. Patch provided by Christian Persch

2004-01-29  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError.
	Patch provided by Christian Persch <chpe@stud.uni-saarland.de>

diff --git a/ChangeLog b/ChangeLog
index d0dbac1f78091676871635b536134b47a5488839..9b4b62cc43146e23fd6a6680943d2156a8286bb4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-29  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError.
+       Patch provided by Christian Persch <chpe@stud.uni-saarland.de>
+
 Thu Jan 29 11:00:18 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkselection.c (gtk_selection_default_handler): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d0dbac1f78091676871635b536134b47a5488839..9b4b62cc43146e23fd6a6680943d2156a8286bb4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-01-29  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError.
+       Patch provided by Christian Persch <chpe@stud.uni-saarland.de>
+
 Thu Jan 29 11:00:18 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkselection.c (gtk_selection_default_handler): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d0dbac1f78091676871635b536134b47a5488839..9b4b62cc43146e23fd6a6680943d2156a8286bb4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2004-01-29  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError.
+       Patch provided by Christian Persch <chpe@stud.uni-saarland.de>
+
 Thu Jan 29 11:00:18 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkselection.c (gtk_selection_default_handler): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d0dbac1f78091676871635b536134b47a5488839..9b4b62cc43146e23fd6a6680943d2156a8286bb4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-01-29  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError.
+       Patch provided by Christian Persch <chpe@stud.uni-saarland.de>
+
 Thu Jan 29 11:00:18 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkselection.c (gtk_selection_default_handler): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d0dbac1f78091676871635b536134b47a5488839..9b4b62cc43146e23fd6a6680943d2156a8286bb4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-01-29  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError.
+       Patch provided by Christian Persch <chpe@stud.uni-saarland.de>
+
 Thu Jan 29 11:00:18 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkselection.c (gtk_selection_default_handler): 

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 4d1565b4dd50798a5cbba950b14607581293d0aa..ce5a3c0a2493417fc74bcc9ffa02dfd631d7fb59 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -1622,6 +1622,7 @@ render_icon_name_pixbuf (GtkIconSource    *icon_source,
   if (!tmp_pixbuf)
     {
       g_warning ("Error loading theme icon for stock: %s", error->message);
+      g_error_free (error);
       return NULL;
     }