[gtk+] GtkFontChooser: Unref deprecated widgets on finalize
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkFontChooser: Unref deprecated widgets on finalize
- Date: Mon, 15 Aug 2011 23:50:35 +0000 (UTC)
commit 3c0b6914e0b998369fe04604af91deecbf83e6e2
Author: Alberto Ruiz <aruiz gnome org>
Date: Thu Apr 28 02:46:09 2011 +0100
GtkFontChooser: Unref deprecated widgets on finalize
gtk/gtkfontchooser.c | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c
index ea6aa89..74afa1b 100644
--- a/gtk/gtkfontchooser.c
+++ b/gtk/gtkfontchooser.c
@@ -908,6 +908,14 @@ gtk_font_selection_finalize (GObject *object)
gtk_font_selection_ref_family (fontsel, NULL);
gtk_font_selection_ref_face (fontsel, NULL);
+ /* FIXME: Remove this for 4.0 */
+ if (fontsel->priv->size_list)
+ {
+ g_object_unref (fontsel->priv->size_list);
+ g_object_unref (fontsel->priv->font_list);
+ g_object_unref (fontsel->priv->face_list);
+ }
+
G_OBJECT_CLASS (gtk_font_selection_parent_class)->finalize (object);
}
@@ -1071,16 +1079,6 @@ initialize_deprecated_widgets (GtkFontSelection *fontsel)
cursor_changed_cb (priv->family_face_list, priv);
}
-static void
-destroy_deprecated_widgets (GtkFontSelection *fontsel)
-{
- GtkFontSelectionPrivate *priv = fontsel->priv;
-
- g_object_unref (priv->size_list);
- g_object_unref (priv->font_list);
- g_object_unref (priv->face_list);
-}
-
/*****************************************************************************
* These functions are the main public interface for getting/setting the font.
*****************************************************************************/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]