From: Jan Djärv <jan.h.d@swipnet.se>
Date: Mon, 28 Jun 2004 12:21:54 +0000 (+0000)
Subject: * gtkutil.c (xg_get_image_for_pixmap): Call g_object_unref on
X-Git-Tag: ttn-vms-21-2-B4~5616
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=74cdfe05c657fa32b8c34b2322ff8f4b39f325cf;p=emacs.git

* gtkutil.c (xg_get_image_for_pixmap): Call g_object_unref on
gpix and gmask just before return to avoid memory leak.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 383f479aabd..2b3d33e7d7a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-28  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (xg_get_image_for_pixmap): Call g_object_unref on
+	gpix and gmask just before return to avoid memory leak.
+
 2004-06-27  Jason Rumney  <jasonr@gnu.org>
 
 	* w32fns.c (file_dialog_callback): Disable edit control if set
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 84aa9f46d4d..3c4c06a9a53 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -308,12 +308,9 @@ xg_get_image_for_pixmap (f, img, widget, old_widget)
                 }
             }
 
-          g_object_unref (G_OBJECT (gmask));
           g_object_unref (G_OBJECT (mask_buf));
         }
 
-      g_object_unref (G_OBJECT (gpix));
-
       if (! old_widget)
         old_widget = GTK_IMAGE (gtk_image_new_from_pixbuf (icon_buf));
       else
@@ -322,6 +319,9 @@ xg_get_image_for_pixmap (f, img, widget, old_widget)
       g_object_unref (G_OBJECT (icon_buf));
     }
 
+  g_object_unref (G_OBJECT (gpix));
+  if (gmask) g_object_unref (G_OBJECT (gmask));
+
   return GTK_WIDGET (old_widget);
 }