free font_desc when finished (#65266)

Sun Nov 25 23:18:39 2001  Kristian Rietveld  <kristian@planet.nl>

        * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc
        when finished (#65266)

Sun Nov 25 23:16:29 2001  Kristian Rietveld  <kristian@planet.nl>

        * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free
        data after we set the property. (#65264)

Sun Nov 25 23:14:06 2001  Kristian Rietveld  <kristian@planet.nl>

        * gtk/gtkbutton.c: add destroy method so label_text gets freed
        if it has been allocated (#65268)

diff --git a/ChangeLog b/ChangeLog
index 905d7ef225253a55cdf7f94ab0171e5c8afb3e01..4d9efbf02a30b021fa294cc62f3a6dfae884a480 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Sun Nov 25 23:18:39 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc
+       when finished (#65266)
+
+Sun Nov 25 23:16:29 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free
+       data after we set the property. (#65264)
+
+Sun Nov 25 23:14:06 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkbutton.c: add destroy method so label_text gets freed
+       if it has been allocated (#65268)
+
 Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>
 
        * gdk/linux-fb/gdkdrawable-fb2.c

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 905d7ef225253a55cdf7f94ab0171e5c8afb3e01..4d9efbf02a30b021fa294cc62f3a6dfae884a480 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,18 @@
+Sun Nov 25 23:18:39 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc
+       when finished (#65266)
+
+Sun Nov 25 23:16:29 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free
+       data after we set the property. (#65264)
+
+Sun Nov 25 23:14:06 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkbutton.c: add destroy method so label_text gets freed
+       if it has been allocated (#65268)
+
 Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>
 
        * gdk/linux-fb/gdkdrawable-fb2.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 905d7ef225253a55cdf7f94ab0171e5c8afb3e01..4d9efbf02a30b021fa294cc62f3a6dfae884a480 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,18 @@
+Sun Nov 25 23:18:39 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc
+       when finished (#65266)
+
+Sun Nov 25 23:16:29 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free
+       data after we set the property. (#65264)
+
+Sun Nov 25 23:14:06 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkbutton.c: add destroy method so label_text gets freed
+       if it has been allocated (#65268)
+
 Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>
 
        * gdk/linux-fb/gdkdrawable-fb2.c

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 905d7ef225253a55cdf7f94ab0171e5c8afb3e01..4d9efbf02a30b021fa294cc62f3a6dfae884a480 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,18 @@
+Sun Nov 25 23:18:39 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc
+       when finished (#65266)
+
+Sun Nov 25 23:16:29 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free
+       data after we set the property. (#65264)
+
+Sun Nov 25 23:14:06 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkbutton.c: add destroy method so label_text gets freed
+       if it has been allocated (#65268)
+
 Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>
 
        * gdk/linux-fb/gdkdrawable-fb2.c

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 905d7ef225253a55cdf7f94ab0171e5c8afb3e01..4d9efbf02a30b021fa294cc62f3a6dfae884a480 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,18 @@
+Sun Nov 25 23:18:39 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc
+       when finished (#65266)
+
+Sun Nov 25 23:16:29 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free
+       data after we set the property. (#65264)
+
+Sun Nov 25 23:14:06 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkbutton.c: add destroy method so label_text gets freed
+       if it has been allocated (#65268)
+
 Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>
 
        * gdk/linux-fb/gdkdrawable-fb2.c

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 905d7ef225253a55cdf7f94ab0171e5c8afb3e01..4d9efbf02a30b021fa294cc62f3a6dfae884a480 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,18 @@
+Sun Nov 25 23:18:39 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc
+       when finished (#65266)
+
+Sun Nov 25 23:16:29 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free
+       data after we set the property. (#65264)
+
+Sun Nov 25 23:14:06 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkbutton.c: add destroy method so label_text gets freed
+       if it has been allocated (#65268)
+
 Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>
 
        * gdk/linux-fb/gdkdrawable-fb2.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 905d7ef225253a55cdf7f94ab0171e5c8afb3e01..4d9efbf02a30b021fa294cc62f3a6dfae884a480 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,18 @@
+Sun Nov 25 23:18:39 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc
+       when finished (#65266)
+
+Sun Nov 25 23:16:29 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free
+       data after we set the property. (#65264)
+
+Sun Nov 25 23:14:06 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkbutton.c: add destroy method so label_text gets freed
+       if it has been allocated (#65268)
+
 Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>
 
        * gdk/linux-fb/gdkdrawable-fb2.c

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index f7811d899e045329f27286c5a64987d2552c9f48..1c8c19bac77bf50bdda925ff4f70ff1c4e6313ec 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -2858,6 +2858,8 @@ gdk_window_set_icon_list (GdkWindow *window,
                        GDK_WINDOW_XID (window),
                        gdk_x11_get_xatom_by_name ("_NET_WM_ICON"));
     }
+  
+  g_free (data);
 }
 
 /**

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 87af04de7d2b5bb2a17a8bab0c56ab62af38584b..e504d32f7f856bca75b4061774b3a5e4d8ff703f 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -67,6 +67,7 @@ enum {
 
 static void gtk_button_class_init     (GtkButtonClass   *klass);
 static void gtk_button_init           (GtkButton        *button);
+static void gtk_button_destroy        (GtkObject        *object);
 static void gtk_button_set_property   (GObject         *object,
                                        guint            prop_id,
                                        const GValue    *value,
@@ -160,6 +161,8 @@ gtk_button_class_init (GtkButtonClass *klass)
   g_object_class->set_property = gtk_button_set_property;
   g_object_class->get_property = gtk_button_get_property;
 
+  object_class->destroy = gtk_button_destroy;
+
   widget_class->realize = gtk_button_realize;
   widget_class->unrealize = gtk_button_unrealize;
   widget_class->map = gtk_button_map;
@@ -307,6 +310,20 @@ gtk_button_init (GtkButton *button)
   button->depressed = FALSE;
 }
 
+static void
+gtk_button_destroy (GtkObject *object)
+{
+  GtkButton *button = GTK_BUTTON (object);
+  
+  if (button->label_text)
+    {
+      g_free (button->label_text);
+      button->label_text = NULL;
+    }
+  
+  (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+}
+
 static GObject*
 gtk_button_constructor (GType                  type,
                        guint                  n_construct_properties,

diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 82fdc836f2be1449c68088a2b3c90e26bcc45e5b..ba04ab3af6f2790fa90aa4e7c9eea19389a907af 100644 (file)
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -999,6 +999,8 @@ gtk_text_tag_set_property (GObject      *object,
           font_desc = pango_font_description_from_string (name);
 
         set_font_description (text_tag, font_desc);
+       if (font_desc)
+         pango_font_description_free (font_desc);
         
         size_changed = TRUE;
       }