AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkFontChooserWidget: Plug several memleaks

Browse Source 
These were showing up in valgrind.
This commit is contained in:
Matthias Clasen 2014-10-14 23:59:25 -04:00
parent 973b52e8cf
commit 30a1c4ab35
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkfontchooserwidget.c
View File

@ -819,6 +819,7 @@ gtk_font_chooser_widget_cell_data_func (GtkTreeViewColumn *column,
pango_font_description_free (font_desc);
pango_attr_list_unref (attrs);
g_free (text);
g_free (preview_title);
}
static void
@ -860,6 +861,8 @@ gtk_font_chooser_widget_finalize (GObject *object)
if (priv->filter_data_destroy)
priv->filter_data_destroy (priv->filter_data);
g_free (priv->preview_text);
G_OBJECT_CLASS (gtk_font_chooser_widget_parent_class)->finalize (object);
}
@ -879,13 +882,14 @@ gtk_font_chooser_widget_find_font (GtkFontChooserWidget *fontchooser,
GtkFontChooserWidgetPrivate *priv = fontchooser->priv;
PangoFontDescription *desc;
PangoFontFamily *family;
gboolean valid;
gboolean valid, found;
if (pango_font_description_get_family (font_desc) == NULL)
return FALSE;
found = FALSE;
for (valid = gtk_tree_model_get_iter_first (priv->model, iter);
valid;
valid && !found;
valid = gtk_tree_model_iter_next (priv->model, iter))
{
gtk_tree_model_get (priv->model, iter,
@ -900,12 +904,12 @@ gtk_font_chooser_widget_find_font (GtkFontChooserWidget *fontchooser,
pango_font_description_merge_static (desc, font_desc, FALSE);
if (pango_font_description_equal (desc, font_desc))
break;
found = TRUE;
pango_font_description_free (desc);
}
return valid;
return found;
}
static void