diff options
author | Kristian Rietveld <kristian@planet.nl> | 2001-11-25 22:19:22 +0000 |
---|---|---|
committer | Kristian Rietveld <kristian@src.gnome.org> | 2001-11-25 22:19:22 +0000 |
commit | 7a181cf52b951103b4037d0d7443c739250c85d0 (patch) | |
tree | 5251c8a1ca3624a514c5e84540e6b604383bcd06 /gtk | |
parent | dc0b9c80214645143ca177d4e085960a27574881 (diff) | |
download | gdk-pixbuf-7a181cf52b951103b4037d0d7443c739250c85d0.tar.gz |
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)
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/gtkbutton.c | 17 | ||||
-rw-r--r-- | gtk/gtktexttag.c | 2 |
2 files changed, 19 insertions, 0 deletions
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 87af04de7..e504d32f7 100644 --- 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 82fdc836f..ba04ab3af 100644 --- 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; } |