diff options
Diffstat (limited to 'gtk/gtkfontchooserwidget.c')
| -rw-r--r-- | gtk/gtkfontchooserwidget.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c index f2865b528d..5fc82b264a 100644 --- a/gtk/gtkfontchooserwidget.c +++ b/gtk/gtkfontchooserwidget.c @@ -897,18 +897,18 @@ gtk_font_chooser_widget_find_font (GtkFontChooserWidget *fontchooser, GtkTreeIter *iter) { GtkFontChooserWidgetPrivate *priv = fontchooser->priv; - PangoFontDescription *desc; - PangoFontFamily *family; - gboolean valid, found; + gboolean valid; 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 && !found; + valid; valid = gtk_tree_model_iter_next (priv->model, iter)) { + PangoFontDescription *desc; + PangoFontFamily *family; + gtk_tree_model_get (priv->model, iter, FAMILY_COLUMN, &family, -1); @@ -920,13 +920,15 @@ gtk_font_chooser_widget_find_font (GtkFontChooserWidget *fontchooser, desc = tree_model_get_font_description (priv->model, iter); pango_font_description_merge_static (desc, font_desc, FALSE); - if (pango_font_description_equal (desc, font_desc)) - found = TRUE; + if (pango_font_description_equal (desc, font_desc)) { + pango_font_description_free (desc); + break; + } pango_font_description_free (desc); } - return found; + return valid; } static void |