From 64d33502644b8fba355f930fc0d30323d33eeff2 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 19 Sep 2011 18:35:57 +0200 Subject: [PATCH] fontchooser: Assume NULL screen means the default screen ... and update the font list only when the screen actually changes. --- gtk/gtkfontchooserwidget.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c index e1cf90a19b..32160a92e8 100644 --- a/gtk/gtkfontchooserwidget.c +++ b/gtk/gtkfontchooserwidget.c @@ -715,9 +715,6 @@ populate_list (GtkFontChooserWidget *fontchooser, gchar *tmp; gchar *family_and_face; - if (!gtk_widget_has_screen (GTK_WIDGET (fontchooser))) - return; - pango_context_list_families (gtk_widget_get_pango_context (GTK_WIDGET (treeview)), &families, &n_families); @@ -967,6 +964,12 @@ gtk_font_chooser_widget_screen_changed (GtkWidget *widget, if (GTK_WIDGET_CLASS (gtk_font_chooser_widget_parent_class)->screen_changed) GTK_WIDGET_CLASS (gtk_font_chooser_widget_parent_class)->screen_changed (widget, previous_screen); + if (previous_screen == NULL) + previous_screen = gdk_screen_get_default (); + + if (previous_screen == gtk_widget_get_screen (widget)) + return; + populate_list (fontchooser, GTK_TREE_VIEW (priv->family_face_list), priv->model);