Make GtkFontChooser an interface

Make the GtkFontChooser API similar to the Gtk{File,Recent,App}Chooser
APIs by introducing GtkFontChooser as an interface, that has a default
implementation in GtkFontChooserWidget.

https://bugzilla.gnome.org/show_bug.cgi?id=657627

1 files changed, 82 insertions, 1115 deletions

diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c
index 1d48016a38..66944dc1a3 100644
--- a/gtk/gtkfontchooser.c
+++ b/gtk/gtkfontchooser.c
@@ -1,4 +1,7 @@
 /* GTK - The GIMP Toolkit
+ * gtkfontchooser.c - Abstract interface for font file selectors GUIs
+ *
+ * Copyright (C) 2006, Emmanuele Bassi
  * Copyright (C) 2011 Alberto Ruiz <aruiz@gnome.org>
  *
  * This library is free software; you can redistribute it and/or
@@ -19,189 +22,66 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <glib/gprintf.h>
-#include <string.h>
-
-#include <atk/atk.h>
-
 #include "gtkfontchooser.h"
-#include "gtkcellrenderertext.h"
-#include "gtkentry.h"
-#include "gtkframe.h"
-#include "gtkbbox.h"
-#include "gtkbox.h"
-#include "gtklabel.h"
-#include "gtkliststore.h"
-#include "gtkstock.h"
-#include "gtktextview.h"
-#include "gtktreeselection.h"
-#include "gtktreeview.h"
-#include "gtkscrolledwindow.h"
+#include "gtkfontchooserprivate.h"
 #include "gtkintl.h"
-#include "gtkaccessible.h"
-#include "gtkbuildable.h"
+#include "gtktypebuiltins.h"
 #include "gtkprivate.h"
-#include "gtkscale.h"
-#include "gtkspinbutton.h"
-#include "gtknotebook.h"
-#include "gtkwidget.h"
-#include "gtkgrid.h"
 
 /**
  * SECTION:gtkfontchooser
- * @Short_description: A widget for selecting fonts
+ * @Short_description: Interface implemented by widgets displaying fonts
  * @Title: GtkFontChooser
- * @See_also: #GtkFontChooserDialog
- *
- * The #GtkFontChooser widget lists the available fonts, styles and sizes,
- * allowing the user to select a font.
- * It is used in the #GtkFontChooserDialog widget to provide a dialog box for
- * selecting fonts.
- *
- * To set the font which is initially selected, use
- * gtk_font_chooser_set_font_name().
+ * @See_also: #GtkFontChooserDialog, #GtkFontChooserWidget, #GtkFontButton
  *
- * To get the selected font use gtk_font_chooser_get_font_name().
- *
- * To change the text which is shown in the preview area, use
- * gtk_font_chooser_set_preview_text().
+ * #GtkFontChooser is an interface that can be implemented by widgets
+ * displaying the list of fonts.  In GTK+, the main objects
+ * that implement this interface are #GtkFontChooserWidget,
+ * #GtkFontChooserDialog and #GtkFontButton.
  *
  * Since: 3.2
  */
 
-
-struct _GtkFontChooserPrivate
+enum
 {
-  GtkWidget    *search_entry;
-  GtkWidget    *family_face_list;
-  GtkWidget    *list_scrolled_window;
-  GtkWidget    *empty_list;
-  GtkWidget    *list_notebook;
-  GtkListStore *model;
-  GtkTreeModel *filter_model;
-
-  GtkWidget       *preview;
-  gchar           *preview_text;
-  gboolean         show_preview_entry;
-
-  GtkWidget *size_spin;
-  GtkWidget *size_slider;
-
-  gchar           *fontname;
-  gint             size;
-  PangoFontFace   *face;
-  PangoFontFamily *family;
-
-  gulong           cursor_changed_handler;
-
-  GtkFontFilterFunc filter_func;
-  gpointer          filter_data;
-  GDestroyNotify    filter_data_destroy;
-};
-
-#define DEFAULT_FONT_NAME "Sans 10"
-#define MAX_FONT_SIZE 999
-
-/* This is the initial fixed height and the top padding of the preview entry */
-#define PREVIEW_HEIGHT 72
-#define PREVIEW_TOP_PADDING 6
-
-/* These are the sizes of the font, style & size lists. */
-#define FONT_LIST_HEIGHT  136
-#define FONT_LIST_WIDTH   190
-#define FONT_STYLE_LIST_WIDTH 170
-#define FONT_SIZE_LIST_WIDTH  60
-
-#define ROW_FORMAT_STRING "<span weight=\"bold\" size=\"small\">%s</span>\n<span size=\"x-large\" font_desc=\"%s\">%s</span>"
-
-#define NO_FONT_MATCHED_SEARCH N_("No fonts matched your search. You can revise your search and try again.")
-
-/* These are what we use as the standard font sizes, for the size list.
- */
-static const gint font_sizes[] = {
-  6, 8, 9, 10, 11, 12, 13, 14, 16, 20, 24, 36, 48, 72
-};
-
-enum {
-   PROP_0,
-   PROP_FONT_NAME,
-   PROP_PREVIEW_TEXT,
-   PROP_SHOW_PREVIEW_ENTRY
-};
-
-
-enum {
-  FAMILY_COLUMN,
-  FACE_COLUMN,
-  PREVIEW_TEXT_COLUMN,
-  PREVIEW_TITLE_COLUMN
-};
-
-enum {
   SIGNAL_FONT_ACTIVATED,
-  N_SIGNALS
+  LAST_SIGNAL
 };
 
-static guint signals[N_SIGNALS] = { 0, };
-
-static void  gtk_font_chooser_set_property       (GObject         *object,
-                                                  guint            prop_id,
-                                                  const GValue    *value,
-                                                  GParamSpec      *pspec);
-static void  gtk_font_chooser_get_property       (GObject         *object,
-                                                  guint            prop_id,
-                                                  GValue          *value,
-                                                  GParamSpec      *pspec);
-static void  gtk_font_chooser_finalize           (GObject         *object);
-static void  gtk_font_chooser_dispose            (GObject         *object);
+static guint chooser_signals[LAST_SIGNAL];
 
-static void  gtk_font_chooser_screen_changed     (GtkWidget       *widget,
-                                                  GdkScreen       *previous_screen);
-static void  gtk_font_chooser_style_updated      (GtkWidget       *widget);
-
-static void gtk_font_chooser_bootstrap_fontlist (GtkFontChooser *fontchooser);
-
-static gboolean gtk_font_chooser_select_font_name (GtkFontChooser *fontchooser);
+#define DEFAULT_FONT_NAME "Sans 10"
+#define MAX_FONT_SIZE 999
 
-G_DEFINE_TYPE (GtkFontChooser, gtk_font_chooser, GTK_TYPE_BOX)
+typedef GtkFontChooserIface GtkFontChooserInterface;
+G_DEFINE_INTERFACE (GtkFontChooser, gtk_font_chooser, G_TYPE_OBJECT);
 
 static void
-gtk_font_chooser_class_init (GtkFontChooserClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  widget_class->screen_changed = gtk_font_chooser_screen_changed;
-  widget_class->style_updated = gtk_font_chooser_style_updated;
-
-  gobject_class->dispose = gtk_font_chooser_dispose;
-  gobject_class->finalize = gtk_font_chooser_finalize;
-  gobject_class->set_property = gtk_font_chooser_set_property;
-  gobject_class->get_property = gtk_font_chooser_get_property;
-
-  g_object_class_install_property (gobject_class,
-                                   PROP_FONT_NAME,
-                                   g_param_spec_string ("font-name",
-                                                        P_("Font name"),
-                                                        P_("The string that represents this font"),
-                                                        DEFAULT_FONT_NAME,
-                                                        GTK_PARAM_READWRITE));
-  g_object_class_install_property (gobject_class,
-                                   PROP_PREVIEW_TEXT,
-                                   g_param_spec_string ("preview-text",
-                                                        P_("Preview text"),
-                                                        P_("The text to display in order to demonstrate the selected font"),
-                                                        pango_language_get_sample_string (NULL),
-                                                        GTK_PARAM_READWRITE));
-
-  g_object_class_install_property (gobject_class,
-                                   PROP_SHOW_PREVIEW_ENTRY,
-                                   g_param_spec_boolean ("show-preview-entry",
-                                                        P_("Show preview text entry"),
-                                                        P_("Whether the preview text entry is shown or not"),
-                                                        TRUE,
-                                                        GTK_PARAM_READWRITE));
+gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
+{
+  g_object_interface_install_property
+     (iface,
+      g_param_spec_string ("font-name",
+                          P_("Font name"),
+                          P_("The string that represents this font"),
+                          DEFAULT_FONT_NAME,
+                          GTK_PARAM_READWRITE));
+
+  g_object_interface_install_property
+     (iface,
+      g_param_spec_string ("preview-text",
+                          P_("Preview text"),
+                          P_("The text to display in order to demonstrate the selected font"),
+                          pango_language_get_sample_string (NULL),
+                          GTK_PARAM_READWRITE));
+
+  g_object_interface_install_property
+     (iface,
+      g_param_spec_boolean ("show-preview-entry",
+                          P_("Show preview text entry"),
+                          P_("Whether the preview text entry is shown or not"),
+                          TRUE,
+                          GTK_PARAM_READWRITE));
 
   /**
    * GtkFontChooserWidget::font-activated:
@@ -212,803 +92,16 @@ gtk_font_chooser_class_init (GtkFontChooserClass *klass)
    * This usually happens when the user double clicks an item,
    * or an item is selected and the user presses one of the keys
    * Space, Shift+Space, Return or Enter.
-   */
-  signals[SIGNAL_FONT_ACTIVATED] =
+    */
+  chooser_signals[SIGNAL_FONT_ACTIVATED] =
     g_signal_new ("font-activated",
                   GTK_TYPE_FONT_CHOOSER,
                   G_SIGNAL_RUN_FIRST,
-                  G_STRUCT_OFFSET (GtkFontChooserClass, font_activated),
+                  G_STRUCT_OFFSET (GtkFontChooserIface, font_activated),
                   NULL, NULL,
                   NULL,
                   G_TYPE_NONE,
                   1, G_TYPE_STRING);
-
-  g_type_class_add_private (klass, sizeof (GtkFontChooserPrivate));
-}
-
-static void
-gtk_font_chooser_set_property (GObject         *object,
-                               guint            prop_id,
-                               const GValue    *value,
-                               GParamSpec      *pspec)
-{
-  GtkFontChooser *fontchooser;
-
-  fontchooser = GTK_FONT_CHOOSER (object);
-
-  switch (prop_id)
-    {
-    case PROP_FONT_NAME:
-      gtk_font_chooser_set_font_name (fontchooser, g_value_get_string (value));
-      break;
-    case PROP_PREVIEW_TEXT:
-      gtk_font_chooser_set_preview_text (fontchooser, g_value_get_string (value));
-      break;
-    case PROP_SHOW_PREVIEW_ENTRY:
-      gtk_font_chooser_set_show_preview_entry (fontchooser, g_value_get_boolean (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_font_chooser_get_property (GObject         *object,
-                               guint            prop_id,
-                               GValue          *value,
-                               GParamSpec      *pspec)
-{
-  GtkFontChooser *fontchooser;
-
-  fontchooser = GTK_FONT_CHOOSER (object);
-
-  switch (prop_id)
-    {
-    case PROP_FONT_NAME:
-      g_value_take_string (value, gtk_font_chooser_get_font_name (fontchooser));
-      break;
-    case PROP_PREVIEW_TEXT:
-      g_value_set_string (value, gtk_font_chooser_get_preview_text (fontchooser));
-      break;
-    case PROP_SHOW_PREVIEW_ENTRY:
-      g_value_set_boolean (value, gtk_font_chooser_get_show_preview_entry (fontchooser));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-text_changed_cb (GtkEntry       *entry,
-                 GParamSpec     *pspec,
-                 GtkFontChooser *fc)
-{
-  GtkFontChooserPrivate *priv = fc->priv;
-  const gchar *text;
-
-  text = gtk_entry_get_text (entry);
-
-  if (text == NULL || text[0] == '\0')
-    {
-      GIcon *icon;
-
-      icon = g_themed_icon_new_with_default_fallbacks ("edit-find-symbolic");
-      g_object_set (G_OBJECT (priv->search_entry),
-                    "secondary-icon-gicon", icon,
-                    "secondary-icon-activatable", FALSE,
-                    "secondary-icon-sensitive", FALSE,
-                    NULL);
-      g_object_unref (icon);
-    }
-  else
-    {
-      if (!gtk_entry_get_icon_activatable (GTK_ENTRY (priv->search_entry), GTK_ENTRY_ICON_SECONDARY))
-        {
-          GIcon *icon;
-
-          icon = g_themed_icon_new_with_default_fallbacks ("edit-clear-symbolic");
-          g_object_set (G_OBJECT (priv->search_entry),
-                        "secondary-icon-gicon", icon,
-                        "secondary-icon-activatable", TRUE,
-                        "secondary-icon-sensitive", TRUE,
-                        NULL);
-          g_object_unref (icon);
-        }
-    }
-
-  gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->filter_model));
-}
-
-static void
-icon_press_cb (GtkEntry             *entry,
-               GtkEntryIconPosition  pos,
-               GdkEvent             *event,
-               gpointer              user_data)
-{
-  gtk_entry_set_text (entry, "");
-}
-
-static void
-slider_change_cb (GtkAdjustment *adjustment,
-                  gpointer       user_data)
-{
-  GtkFontChooser        *fc    = (GtkFontChooser*)user_data;
-  GtkFontChooserPrivate *priv  = fc->priv;
-  GtkAdjustment         *spin_adj     = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON (priv->size_spin));
-  gdouble                slider_value = gtk_adjustment_get_value (adjustment);
-  gdouble                spin_value   = gtk_adjustment_get_value (spin_adj);
-
-  if (slider_value != spin_value)
-    gtk_adjustment_set_value (spin_adj,
-                              gtk_adjustment_get_value (adjustment));
-}
-
-static void
-spin_change_cb (GtkAdjustment *adjustment,
-                gpointer       user_data)
-{
-  PangoFontDescription    *desc;
-  GtkFontChooser          *fontchooser = (GtkFontChooser*)user_data;
-  GtkFontChooserPrivate   *priv        = fontchooser->priv;
-  GtkAdjustment           *slider_adj  = gtk_range_get_adjustment (GTK_RANGE (priv->size_slider));
-
-  gdouble size = gtk_adjustment_get_value (adjustment);
-  priv->size = ((gint)size) * PANGO_SCALE;
-
-  desc = pango_context_get_font_description (gtk_widget_get_pango_context (priv->preview));
-  pango_font_description_set_size (desc, priv->size);
-  gtk_widget_override_font (priv->preview, desc);
-
-  g_object_notify (G_OBJECT (fontchooser), "font-name");
-
-  /* If the new value is lower than the lower bound of the slider, we set
-   * the slider adjustment to the lower bound value if it is not already set
-   */
-  if (size < gtk_adjustment_get_lower (slider_adj) &&
-      gtk_adjustment_get_value (slider_adj) != gtk_adjustment_get_lower (slider_adj))
-    gtk_adjustment_set_value (slider_adj, gtk_adjustment_get_lower (slider_adj));
-
-  /* If the new value is upper than the upper bound of the slider, we set
-   * the slider adjustment to the upper bound value if it is not already set
-   */
-  else if (size > gtk_adjustment_get_upper (slider_adj) &&
-           gtk_adjustment_get_value (slider_adj) != gtk_adjustment_get_upper (slider_adj))
-    gtk_adjustment_set_value (slider_adj, gtk_adjustment_get_upper (slider_adj));
-
-  /* If the new value is not already set on the slider we set it */
-  else if (size != gtk_adjustment_get_value (slider_adj))
-    gtk_adjustment_set_value (slider_adj, size);
-
-  gtk_widget_queue_draw (priv->preview);
-}
-
-static void
-set_range_marks (GtkFontChooserPrivate *priv,
-                 GtkWidget             *size_slider,
-                 gint                  *sizes,
-                 gint                   length)
-{
-  GtkAdjustment *adj;
-  gint i;
-  gdouble value;
-
-  if (length < 2)
-    {
-      sizes = (gint*)font_sizes;
-      length = G_N_ELEMENTS (font_sizes);
-    }
-
-  gtk_scale_clear_marks (GTK_SCALE (size_slider));
-
-  adj = gtk_range_get_adjustment(GTK_RANGE (size_slider));
-
-  gtk_adjustment_set_lower (adj, (gdouble) sizes[0]);
-  gtk_adjustment_set_upper (adj, (gdouble) sizes[length-1]);
-
-  value = gtk_adjustment_get_value (adj);
-  if (value > (gdouble) sizes[length-1])
-    gtk_adjustment_set_value (adj, (gdouble) sizes[length-1]);
-  else if (value < (gdouble) sizes[0])
-    gtk_adjustment_set_value (adj, (gdouble) sizes[0]);
-
-  for (i = 0; i < length; i++)
-    gtk_scale_add_mark (GTK_SCALE (size_slider),
-                        (gdouble) sizes[i],
-                        GTK_POS_BOTTOM, NULL);
-}
-
-static void
-row_activated_cb (GtkTreeView       *view,
-                  GtkTreePath       *path,
-                  GtkTreeViewColumn *column,
-                  gpointer           user_data)
-{
-  GtkFontChooser *self = user_data;
-  gchar *fontname;
-
-  fontname = gtk_font_chooser_get_font_name (self);
-
-  g_signal_emit (self, signals[SIGNAL_FONT_ACTIVATED], 0, fontname);
-  g_free (fontname);
-}
-
-static void
-cursor_changed_cb (GtkTreeView *treeview,
-                   gpointer     user_data)
-{
-  GtkFontChooser *fontchooser = (GtkFontChooser*)user_data;
-  GtkFontChooserPrivate *priv = fontchooser->priv;
-
-  PangoFontFamily      *family;
-  PangoFontFace        *face;
-  PangoFontDescription *desc;
-
-  gint *sizes;
-  gint  i, n_sizes;
-
-  GtkTreeIter  iter;
-  GtkTreePath *path = gtk_tree_path_new ();
-
-  gtk_tree_view_get_cursor (treeview, &path, NULL);
-
-  if (!path)
-    return;
-
-  if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->filter_model), &iter, path))
-    {
-      gtk_tree_path_free (path);
-      return;
-    }
-
-
-  gtk_tree_model_get (GTK_TREE_MODEL (priv->filter_model), &iter,
-                      FACE_COLUMN, &face,
-                      FAMILY_COLUMN, &family,
-                      -1);
-
-  gtk_tree_view_scroll_to_cell (treeview, path, NULL, FALSE, 0.5, 0.5);
-
-  gtk_tree_path_free (path);
-  path = NULL;
-
-  if (face == NULL || family == NULL)
-    {
-      if (face)
-        g_object_unref (face);
-      if (family)
-        g_object_unref (family);
-
-      return;
-    }
-
-  desc = pango_font_face_describe (face);
-  pango_font_description_set_size (desc, priv->size);
-  gtk_widget_override_font (priv->preview, desc);
-
-  pango_font_face_list_sizes (face, &sizes, &n_sizes);
-  /* It seems not many fonts actually have a sane set of sizes */
-  for (i = 0; i < n_sizes; i++)
-    sizes[i] = sizes[i] / PANGO_SCALE;
-
-  set_range_marks (priv, priv->size_slider, sizes, n_sizes);
-
-  if (priv->family)
-    g_object_unref (priv->family);
-  priv->family = family;
-
-  if (priv->face)
-    g_object_unref (priv->face);
-  priv->face = face;
-
-  pango_font_description_free (desc);
-
-  g_object_notify (G_OBJECT (fontchooser), "font-name");
-}
-
-static gboolean
-zoom_preview_cb (GtkWidget      *scrolled_window,
-                 GdkEventScroll *event,
-                 gpointer        user_data)
-{
-  GtkFontChooser        *fc    = (GtkFontChooser*)user_data;
-  GtkFontChooserPrivate *priv  = fc->priv;
-
-  GtkAdjustment *adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->size_spin));
-
-  if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_RIGHT)
-    gtk_adjustment_set_value (adj,
-                              gtk_adjustment_get_value (adj) +
-                              gtk_adjustment_get_step_increment (adj));
-  else if (event->direction == GDK_SCROLL_DOWN || event->direction == GDK_SCROLL_LEFT)
-    gtk_adjustment_set_value (adj,
-                              gtk_adjustment_get_value (adj) -
-                              gtk_adjustment_get_step_increment (adj));
-  return TRUE;
-}
-
-static void
-row_inserted_cb (GtkTreeModel *model,
-                 GtkTreePath  *path,
-                 GtkTreeIter  *iter,
-                 gpointer      user_data)
-{
-  GtkFontChooser        *fontchooser = (GtkFontChooser*)user_data;
-  GtkFontChooserPrivate *priv        = fontchooser->priv;
-
-  gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->list_notebook), 0);
-}
-
-static void
-row_deleted_cb  (GtkTreeModel *model,
-                 GtkTreePath  *path,
-                 gpointer      user_data)
-{
-  GtkFontChooser        *fontchooser = (GtkFontChooser*)user_data;
-  GtkFontChooserPrivate *priv        = fontchooser->priv;
-
-  if (gtk_tree_model_iter_n_children (model, NULL) == 0)
-    gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->list_notebook), 1);
-}
-
-static void
-gtk_font_chooser_init (GtkFontChooser *fontchooser)
-{
-  GIcon                   *icon;
-  GtkFontChooserPrivate   *priv;
-  PangoFontDescription    *font_desc;
-  GtkWidget               *scrolled_win;
-  GtkWidget               *grid;
-
-  fontchooser->priv = G_TYPE_INSTANCE_GET_PRIVATE (fontchooser,
-                                                   GTK_TYPE_FONT_CHOOSER,
-                                                   GtkFontChooserPrivate);
-
-  priv = fontchooser->priv;
-
-  /* Default preview string  */
-  priv->preview_text = g_strdup (pango_language_get_sample_string (NULL));
-  priv->show_preview_entry = TRUE;
-
-  /* Getting the default size */
-  font_desc  = pango_context_get_font_description (gtk_widget_get_pango_context (GTK_WIDGET (fontchooser)));
-  priv->size = pango_font_description_get_size (font_desc);
-  priv->face = NULL;
-  priv->family = NULL;
-
-  gtk_widget_push_composite_child ();
-
-  /* Creating fundamental widgets for the private struct */
-  priv->search_entry = gtk_entry_new ();
-  priv->family_face_list = gtk_tree_view_new ();
-  priv->preview = gtk_entry_new ();
-  priv->size_slider = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
-                                                (gdouble) font_sizes[0],
-                                                (gdouble) font_sizes[G_N_ELEMENTS (font_sizes) - 1],
-                                                1.0);
-
-  priv->size_spin = gtk_spin_button_new_with_range (0.0, (gdouble)(G_MAXINT / PANGO_SCALE), 1.0);
-
-  /** Bootstrapping widget layout **/
-  gtk_box_set_spacing (GTK_BOX (fontchooser), 6);
-
-  /* Main font family/face view */
-  priv->list_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  scrolled_win = priv->list_scrolled_window;
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
-                                  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win),
-                                       GTK_SHADOW_ETCHED_IN);
-  gtk_widget_set_size_request (scrolled_win, 400, 300);
-  gtk_container_add (GTK_CONTAINER (scrolled_win), priv->family_face_list);
-
-  /* Text to display when list is empty */
-  priv->empty_list = gtk_label_new (_(NO_FONT_MATCHED_SEARCH));
-  gtk_widget_set_margin_top    (priv->empty_list, 12);
-  gtk_widget_set_margin_left   (priv->empty_list, 12);
-  gtk_widget_set_margin_right  (priv->empty_list, 12);
-  gtk_widget_set_margin_bottom (priv->empty_list, 12);
-  gtk_widget_set_halign (priv->empty_list, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (priv->empty_list, GTK_ALIGN_START);
-
-  priv->list_notebook = gtk_notebook_new ();
-  gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->list_notebook), FALSE);
-  gtk_notebook_append_page (GTK_NOTEBOOK (priv->list_notebook), scrolled_win, NULL);
-  gtk_notebook_append_page (GTK_NOTEBOOK (priv->list_notebook), priv->empty_list, NULL);
-
-  /* Basic layout */
-  grid = gtk_grid_new ();
-
-  gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
-  gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
-
-  gtk_grid_attach (GTK_GRID (grid), priv->search_entry, 0, 0, 2, 1);
-  gtk_grid_attach (GTK_GRID (grid), priv->list_notebook, 0, 1, 2, 1);
-  gtk_grid_attach (GTK_GRID (grid), priv->preview,      0, 2, 2, 1);
-
-  gtk_grid_attach (GTK_GRID (grid), priv->size_slider,  0, 3, 1, 1);
-  gtk_grid_attach (GTK_GRID (grid), priv->size_spin,    1, 3, 1, 1);
-
-  gtk_widget_set_hexpand  (GTK_WIDGET (scrolled_win),      TRUE);
-  gtk_widget_set_vexpand  (GTK_WIDGET (scrolled_win),      TRUE);
-  gtk_widget_set_hexpand  (GTK_WIDGET (priv->search_entry), TRUE);
-
-  gtk_widget_set_hexpand  (GTK_WIDGET (priv->size_slider), TRUE);
-  gtk_widget_set_hexpand  (GTK_WIDGET (priv->size_spin),   FALSE);
-
-  gtk_box_pack_start (GTK_BOX (fontchooser), grid, TRUE, TRUE, 0);
-
-  /* Setting the adjustment values for the size slider */
-  gtk_adjustment_set_value (gtk_range_get_adjustment (GTK_RANGE (priv->size_slider)),
-                            (gdouble)(priv->size / PANGO_SCALE));
-  gtk_adjustment_set_value (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->size_spin)),
-                            (gdouble)(priv->size / PANGO_SCALE));
-
-  gtk_widget_show_all (GTK_WIDGET (fontchooser));
-  gtk_widget_hide     (GTK_WIDGET (fontchooser));
-
-  /* Treeview column and model bootstrapping */
-  gtk_font_chooser_bootstrap_fontlist (fontchooser);
-
-  /* Set default preview text */
-  gtk_entry_set_text (GTK_ENTRY (priv->preview),
-                      pango_language_get_sample_string (NULL));
-
-  /* Set search icon and place holder text */
-  icon = g_themed_icon_new_with_default_fallbacks ("edit-find-symbolic");
-  g_object_set (G_OBJECT (priv->search_entry),
-                "secondary-icon-gicon", icon,
-                "secondary-icon-activatable", FALSE,
-                "secondary-icon-sensitive", FALSE,
-                NULL);
-  g_object_unref (icon);
-
-  gtk_entry_set_placeholder_text (GTK_ENTRY (priv->search_entry), _("Search font name"));
-
-  /** Callback connections **/
-  g_signal_connect (priv->search_entry, "notify::text",
-                    G_CALLBACK (text_changed_cb), fontchooser);
-  g_signal_connect (priv->search_entry,
-                    "icon-press", G_CALLBACK (icon_press_cb), NULL);
-
-  g_signal_connect (gtk_range_get_adjustment (GTK_RANGE (priv->size_slider)),
-                    "value-changed", G_CALLBACK (slider_change_cb), fontchooser);
-  g_signal_connect (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->size_spin)),
-                    "value-changed", G_CALLBACK (spin_change_cb), fontchooser);
-
-  priv->cursor_changed_handler =
-      g_signal_connect (priv->family_face_list, "cursor-changed",
-                        G_CALLBACK (cursor_changed_cb), fontchooser);
-
-  g_signal_connect (priv->family_face_list, "row-activated",
-                    G_CALLBACK (row_activated_cb), fontchooser);
-
-  /* Zoom on preview scroll */
-  g_signal_connect (priv->preview, "scroll-event",
-                    G_CALLBACK (zoom_preview_cb), fontchooser);
-
-  g_signal_connect (priv->size_slider, "scroll-event",
-                    G_CALLBACK (zoom_preview_cb), fontchooser);
-
-  set_range_marks (priv, priv->size_slider, (gint*)font_sizes, G_N_ELEMENTS (font_sizes));
-
-  /* Font list empty hides the scrolledwindow */
-  g_signal_connect (G_OBJECT (priv->filter_model), "row-deleted",
-                    G_CALLBACK (row_deleted_cb), fontchooser);
-  g_signal_connect (G_OBJECT (priv->filter_model), "row-inserted",
-                    G_CALLBACK (row_inserted_cb), fontchooser);
-
-  /* Set default focus */
-  gtk_widget_pop_composite_child ();
-}
-
-/**
- * gtk_font_chooser_new:
- *
- * Creates a new #GtkFontChooser.
- *
- * Return value: a new #GtkFontChooser
- *
- * Since: 3.2
- */
-GtkWidget *
-gtk_font_chooser_new (void)
-{
-  GtkFontChooser *fontchooser;
-
-  fontchooser = g_object_new (GTK_TYPE_FONT_CHOOSER, NULL);
-
-  return GTK_WIDGET (fontchooser);
-}
-
-static int
-cmp_families (const void *a,
-              const void *b)
-{
-  const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a);
-  const char *b_name = pango_font_family_get_name (*(PangoFontFamily **)b);
-
-  return g_utf8_collate (a_name, b_name);
-}
-
-static void
-populate_list (GtkFontChooser *fontchooser,
-               GtkTreeView    *treeview,
-               GtkListStore   *model)
-{
-  GtkFontChooserPrivate *priv = fontchooser->priv;
-  GtkStyleContext *style_context;
-  PangoFontDescription *default_font;
-  PangoFontDescription *selected_font;
-
-  gint match;
-  GtkTreeIter match_row;
-  GtkTreePath *path;
-
-  gint n_families, i;
-  PangoFontFamily **families;
-  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);
-
-  qsort (families, n_families, sizeof (PangoFontFamily *), cmp_families);
-
-  style_context = gtk_widget_get_style_context (GTK_WIDGET (treeview));
-  default_font = (PangoFontDescription*) gtk_style_context_get_font (style_context,
-                                                                     GTK_STATE_NORMAL);
-
-  if (priv->face)
-    selected_font = pango_font_face_describe (priv->face);
-  else
-    selected_font = NULL;
-
-  gtk_list_store_clear (model);
-
-  match = 0;
-
-  /* Iterate over families and faces */
-  for (i = 0; i < n_families; i++)
-    {
-      GtkTreeIter     iter;
-      PangoFontFace **faces;
-      int             j, n_faces;
-      const gchar    *fam_name = pango_font_family_get_name (families[i]);
-
-      pango_font_family_list_faces (families[i], &faces, &n_faces);
-
-      for (j = 0; j < n_faces; j++)
-        {
-          PangoFontDescription *pango_desc;
-          const gchar *face_name;
-          gchar *font_desc;
-
-          if (priv->filter_func != NULL &&
-              !priv->filter_func (families[i], faces[j], priv->filter_data))
-            continue;
-
-          pango_desc = pango_font_face_describe (faces[j]);
-          face_name = pango_font_face_get_face_name (faces[j]);
-          font_desc = pango_font_description_to_string (pango_desc);
-
-          family_and_face = g_strconcat (fam_name, " ", face_name, NULL);
-          tmp = g_markup_printf_escaped (ROW_FORMAT_STRING,
-                                         family_and_face,
-                                         font_desc,
-                                         fontchooser->priv->preview_text);
-
-          gtk_list_store_append (model, &iter);
-          gtk_list_store_set (model, &iter,
-                              FAMILY_COLUMN, families[i],
-                              FACE_COLUMN, faces[j],
-                              PREVIEW_TITLE_COLUMN, family_and_face,
-                              PREVIEW_TEXT_COLUMN, tmp,
-                              -1);
-
-          /* Select the current font,
-           * the default font/face from the theme,
-           * or the first font
-           */
-          if (match < 3 &&
-              selected_font != NULL &&
-              pango_font_description_equal (selected_font, pango_desc))
-            {
-              match_row = iter;
-              match = 3;
-            }
-          if (match < 2 &&
-              strcmp (fam_name, pango_font_description_get_family (default_font)) == 0)
-            {
-              match_row = iter;
-              match = 2;
-            }
-          if (match < 1)
-            {
-              match_row = iter;
-              match = 1;
-            }
-
-          pango_font_description_free (pango_desc);
-          g_free (font_desc);
-          g_free (family_and_face);
-          g_free (tmp);
-        }
-
-      g_free (faces);
-    }
-
-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &match_row);
-  if (path)
-    {
-      gtk_tree_view_set_cursor (treeview, path, NULL, FALSE);
-      gtk_tree_view_scroll_to_cell (treeview, path, NULL, FALSE, 0.5, 0.5);
-      gtk_tree_path_free (path);
-    }
-
-  if (selected_font)
-    pango_font_description_free (selected_font);
-
-  g_free (families);
-}
-
-static gboolean
-visible_func (GtkTreeModel *model,
-              GtkTreeIter  *iter,
-              gpointer      user_data)
-{
-  gboolean result = TRUE;
-  GtkFontChooserPrivate *priv = (GtkFontChooserPrivate*)user_data;
-
-  const gchar *search_text = (const gchar*)gtk_entry_get_text (GTK_ENTRY (priv->search_entry));
-  gchar       *font_name;
-  gchar       *term;
-  gchar      **split_terms;
-  gint         n_terms = 0;
-
-  /* If there's no filter string we show the item */
-  if (strlen (search_text) == 0)
-    return TRUE;
-
-  gtk_tree_model_get (model, iter,
-                      PREVIEW_TITLE_COLUMN, &font_name,
-                      -1);
-
-  if (font_name == NULL)
-    return FALSE;
-
-  split_terms = g_strsplit (search_text, " ", 0);
-  term = split_terms[0];
-
-  while (term && result)
-  {
-    gchar* font_name_casefold = g_utf8_casefold (font_name, -1);
-    gchar* term_casefold = g_utf8_casefold (term, -1);
-
-    if (g_strrstr (font_name_casefold, term_casefold))
-      result = result && TRUE;
-    else
-      result = FALSE;
-
-    n_terms++;
-    term = split_terms[n_terms];
-
-    g_free (term_casefold);
-    g_free (font_name_casefold);
-  }
-
-  g_free (font_name);
-  g_strfreev (split_terms);
-
-  return result;
-}
-
-static void
-gtk_font_chooser_bootstrap_fontlist (GtkFontChooser *fontchooser)
-{
-  GtkFontChooserPrivate *priv = fontchooser->priv;
-  GtkTreeView       *treeview = GTK_TREE_VIEW (priv->family_face_list);
-  GtkCellRenderer   *cell;
-  GtkTreeViewColumn *col;
-
-  priv->model = gtk_list_store_new (4,
-                                    PANGO_TYPE_FONT_FAMILY,
-                                    PANGO_TYPE_FONT_FACE,
-                                    G_TYPE_STRING,
-                                    G_TYPE_STRING);
-
-  priv->filter_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (priv->model), NULL);
-  g_object_unref (priv->model);
-
-  gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (priv->filter_model),
-                                          visible_func, (gpointer)priv, NULL);
-
-  gtk_tree_view_set_model (treeview, GTK_TREE_MODEL (priv->filter_model));
-  g_object_unref (priv->filter_model);
-
-  gtk_tree_view_set_rules_hint      (treeview, TRUE);
-  gtk_tree_view_set_headers_visible (treeview, FALSE);
-
-  cell = gtk_cell_renderer_text_new ();
-  col = gtk_tree_view_column_new_with_attributes ("Family",
-                                                  cell,
-                                                  "markup", PREVIEW_TEXT_COLUMN,
-                                                  NULL);
-
-  g_object_set (cell, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-
-  gtk_tree_view_append_column (treeview, col);
-
-  populate_list (fontchooser, treeview, priv->model);
-}
-
-static void
-gtk_font_chooser_dispose (GObject *object)
-{
-  GtkFontChooser *fontchooser = GTK_FONT_CHOOSER (object);
-  GtkFontChooserPrivate *priv = fontchooser->priv;
-
-  if (priv->cursor_changed_handler != 0)
-    {
-      g_signal_handler_disconnect (priv->family_face_list,
-                                   priv->cursor_changed_handler);
-      priv->cursor_changed_handler = 0;
-    }
-
-  G_OBJECT_CLASS (gtk_font_chooser_parent_class)->dispose (object);
-}
-
-static void
-gtk_font_chooser_finalize (GObject *object)
-{
-  GtkFontChooser *fontchooser = GTK_FONT_CHOOSER (object);
-  GtkFontChooserPrivate *priv = fontchooser->priv;
-
-  if (priv->fontname)
-    g_free (priv->fontname);
-
-  if (priv->family)
-    g_object_unref (priv->family);
-
-  if (priv->face)
-    g_object_unref (priv->face);
-
-  if (priv->filter_data_destroy)
-    priv->filter_data_destroy (priv->filter_data);
-
-  G_OBJECT_CLASS (gtk_font_chooser_parent_class)->finalize (object);
-}
-
-static void
-gtk_font_chooser_screen_changed (GtkWidget *widget,
-                                 GdkScreen *previous_screen)
-{
-  GtkFontChooser *fontchooser = GTK_FONT_CHOOSER (widget);
-  GtkFontChooserPrivate *priv = fontchooser->priv;
-
-  populate_list (fontchooser,
-                 GTK_TREE_VIEW (priv->family_face_list),
-                 priv->model);
-
-  if (priv->fontname)
-    gtk_font_chooser_select_font_name (fontchooser);
-}
-
-static void
-gtk_font_chooser_style_updated (GtkWidget *widget)
-{
-  GtkFontChooser *fontchooser = GTK_FONT_CHOOSER (widget);
-
-  GTK_WIDGET_CLASS (gtk_font_chooser_parent_class)->style_updated (widget);
-
-  populate_list (fontchooser,
-                 GTK_TREE_VIEW (fontchooser->priv->family_face_list),
-                 fontchooser->priv->model);
 }
 
 /**
@@ -1029,7 +122,7 @@ gtk_font_chooser_get_family (GtkFontChooser *fontchooser)
 {
   g_return_val_if_fail (GTK_IS_FONT_CHOOSER (fontchooser), NULL);
 
-  return fontchooser->priv->family;
+  return GTK_FONT_CHOOSER_GET_IFACE (fontchooser)->get_font_family (fontchooser);
 }
 
 /**
@@ -1050,7 +143,7 @@ gtk_font_chooser_get_face (GtkFontChooser *fontchooser)
 {
   g_return_val_if_fail (GTK_IS_FONT_CHOOSER (fontchooser), NULL);
 
-  return fontchooser->priv->face;
+  return GTK_FONT_CHOOSER_GET_IFACE (fontchooser)->get_font_face (fontchooser);
 }
 
 /**
@@ -1069,7 +162,7 @@ gtk_font_chooser_get_size (GtkFontChooser *fontchooser)
 {
   g_return_val_if_fail (GTK_IS_FONT_CHOOSER (fontchooser), -1);
 
-  return fontchooser->priv->size;
+  return GTK_FONT_CHOOSER_GET_IFACE (fontchooser)->get_font_size (fontchooser);
 }
 
 /**
@@ -1096,21 +189,9 @@ gtk_font_chooser_get_size (GtkFontChooser *fontchooser)
 gchar *
 gtk_font_chooser_get_font_name (GtkFontChooser *fontchooser)
 {
-  gchar                *font_name;
-  gchar                *font_desc_name;
-  PangoFontDescription *desc;
-
-  if (!fontchooser->priv->face)
-    return NULL;
-
-  desc = pango_font_face_describe (fontchooser->priv->face);
-  font_desc_name = pango_font_description_to_string (desc);
-  pango_font_description_free (desc);
-
-  font_name = g_strdup_printf ("%s %d", font_desc_name, fontchooser->priv->size / PANGO_SCALE);
-  g_free (font_desc_name);
+  g_return_val_if_fail (GTK_IS_FONT_CHOOSER (fontchooser), NULL);
 
-  return font_name;
+  return GTK_FONT_CHOOSER_GET_IFACE (fontchooser)->get_font_name (fontchooser);
 }
 
 /**
@@ -1130,112 +211,11 @@ gboolean
 gtk_font_chooser_set_font_name (GtkFontChooser *fontchooser,
                                 const gchar    *fontname)
 {
-  GtkFontChooserPrivate *priv = fontchooser->priv;
-  gboolean found = FALSE;
-
   g_return_val_if_fail (GTK_IS_FONT_CHOOSER (fontchooser), FALSE);
   g_return_val_if_fail (fontname != NULL, FALSE);
 
-  if (priv->fontname)
-    g_free (priv->fontname);
-  priv->fontname = g_strdup (fontname);
-
-  if (gtk_widget_has_screen (GTK_WIDGET (fontchooser)))
-    found = gtk_font_chooser_select_font_name (fontchooser);
-
-  g_object_notify (G_OBJECT (fontchooser), "font-name");
-
-  return found;
-}
-
-static gboolean
-gtk_font_chooser_select_font_name (GtkFontChooser *fontchooser)
-{
-  GtkFontChooserPrivate *priv = fontchooser->priv;
-  GtkTreeIter iter;
-  gboolean valid;
-  gchar *family_name;
-  PangoFontDescription *desc;
-  gboolean found = FALSE;
-
-  desc = pango_font_description_from_string (priv->fontname);
-  family_name = (gchar*)pango_font_description_get_family (desc);
-
-  g_free (priv->fontname);
-  priv->fontname = NULL;
-
-  if (!family_name)
-    {
-      pango_font_description_free (desc);
-      return FALSE;
-    }
-
-  /* We make sure the filter is clear */
-  gtk_entry_set_text (GTK_ENTRY (priv->search_entry), "");
-
-  /* We find the matching family/face */
-  for (valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->filter_model), &iter);
-       valid;
-       valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->filter_model), &iter))
-    {
-      PangoFontFace        *face;
-      PangoFontDescription *tmp_desc;
-
-      gtk_tree_model_get (GTK_TREE_MODEL (priv->filter_model), &iter,
-                          FACE_COLUMN, &face,
-                          -1);
-
-      tmp_desc = pango_font_face_describe (face);
-      if (pango_font_description_get_size_is_absolute (desc))
-        pango_font_description_set_absolute_size (tmp_desc,
-                                                  pango_font_description_get_size (desc));
-      else
-        pango_font_description_set_size (tmp_desc,
-                                         pango_font_description_get_size (desc));
-
-      if (pango_font_description_equal (desc, tmp_desc))
-        {
-          GtkTreePath *path;
-          gint size = pango_font_description_get_size (desc);
-
-          if (size)
-            {
-              if (pango_font_description_get_size_is_absolute (desc))
-                size = size * PANGO_SCALE;
-              gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->size_spin),
-                                         size / PANGO_SCALE);
-            }
-
-          path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->filter_model), &iter);
-
-          if (path)
-            {
-              gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->family_face_list),
-                                        path,
-                                        NULL,
-                                        FALSE);
-              gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (priv->family_face_list),
-                                            path,
-                                            NULL,
-                                            FALSE,
-                                            0.5,
-                                            0.5);
-              gtk_tree_path_free (path);
-            }
-
-          found = TRUE;
-        }
-
-      g_object_unref (face);
-      pango_font_description_free (tmp_desc);
-
-      if (found)
-        break;
-    }
-
-  pango_font_description_free (desc);
-
-  return found;
+  return GTK_FONT_CHOOSER_GET_IFACE (fontchooser)->set_font_name (fontchooser,
+                                                                  fontname);
 }
 
 /**
@@ -1244,20 +224,22 @@ gtk_font_chooser_select_font_name (GtkFontChooser *fontchooser)
  *
  * Gets the text displayed in the preview area.
  *
- * Return value: (transfer none): the text displayed in the
- *     preview area. This string is owned by the widget and
- *     should not be modified or freed
+ * Return value: (transfer full): the text displayed in the
+ *     preview area
  *
  * Since: 3.2
  */
-const gchar*
+gchar *
 gtk_font_chooser_get_preview_text (GtkFontChooser *fontchooser)
 {
+  char *text;
+
   g_return_val_if_fail (GTK_IS_FONT_CHOOSER (fontchooser), NULL);
 
-  return (const gchar*)fontchooser->priv->preview_text;
-}
+  g_object_get (fontchooser, "preview-text", &text, NULL);
 
+  return text;
+}
 
 /**
  * gtk_font_chooser_set_preview_text:
@@ -1276,16 +258,7 @@ gtk_font_chooser_set_preview_text (GtkFontChooser *fontchooser,
   g_return_if_fail (GTK_IS_FONT_CHOOSER (fontchooser));
   g_return_if_fail (text != NULL);
 
-  g_free (fontchooser->priv->preview_text);
-  fontchooser->priv->preview_text = g_strdup (text);
-
-  populate_list (fontchooser,
-                 GTK_TREE_VIEW (fontchooser->priv->family_face_list),
-                 fontchooser->priv->model);
-
-  gtk_entry_set_text (GTK_ENTRY (fontchooser->priv->preview), text);
-
-  g_object_notify (G_OBJECT (fontchooser), "preview-text");
+  g_object_set (fontchooser, "preview-text", text, NULL);
 }
 
 /**
@@ -1302,9 +275,13 @@ gtk_font_chooser_set_preview_text (GtkFontChooser *fontchooser,
 gboolean
 gtk_font_chooser_get_show_preview_entry (GtkFontChooser *fontchooser)
 {
+  gboolean show;
+
   g_return_val_if_fail (GTK_IS_FONT_CHOOSER (fontchooser), FALSE);
 
-  return fontchooser->priv->show_preview_entry;
+  g_object_get (fontchooser, "show-preview-entry", &show, NULL);
+
+  return show;
 }
 
 /**
@@ -1320,28 +297,17 @@ void
 gtk_font_chooser_set_show_preview_entry (GtkFontChooser *fontchooser,
                                          gboolean        show_preview_entry)
 {
-  GtkFontChooserPrivate *priv = fontchooser->priv;
-
   g_return_if_fail (GTK_IS_FONT_CHOOSER (fontchooser));
 
-  if (priv->show_preview_entry != show_preview_entry)
-    {
-      fontchooser->priv->show_preview_entry = show_preview_entry;
-
-      if (show_preview_entry)
-        gtk_widget_show (fontchooser->priv->preview);
-      else
-        gtk_widget_hide (fontchooser->priv->preview);
-
-      g_object_notify (G_OBJECT (fontchooser), "show-preview-entry");
-    }
+  show_preview_entry = show_preview_entry != FALSE;
+  g_object_set (fontchooser, "show-preview-entry", show_preview_entry, NULL);
 }
 
 /**
  * gtk_font_chooser_set_filter_func:
  * @fontchooser: a #GtkFontChooser
  * @filter: (allow-none): a #GtkFontFilterFunc, or %NULL
- * @data: data to pass to @filter
+ * @user_data: data to pass to @filter
  * @destroy: function to call to free @data when it is no longer needed
  *
  * Adds a filter function that decides which fonts to display
@@ -1352,21 +318,22 @@ gtk_font_chooser_set_show_preview_entry (GtkFontChooser *fontchooser,
 void
 gtk_font_chooser_set_filter_func (GtkFontChooser   *fontchooser,
                                   GtkFontFilterFunc filter,
-                                  gpointer          data,
+                                  gpointer          user_data,
                                   GDestroyNotify    destroy)
 {
-  GtkFontChooserPrivate *priv = fontchooser->priv;
-
   g_return_if_fail (GTK_IS_FONT_CHOOSER (fontchooser));
 
-  if (priv->filter_data_destroy)
-    priv->filter_data_destroy (priv->filter_data);
+  GTK_FONT_CHOOSER_GET_IFACE (fontchooser)->set_filter_func (fontchooser,
+                                                             filter,
+                                                             user_data,
+                                                             destroy);
+}
 
-  priv->filter_func = filter;
-  priv->filter_data = data;
-  priv->filter_data_destroy = destroy;
+void
+_gtk_font_chooser_font_activated (GtkFontChooser *chooser,
+                                  const gchar    *fontname)
+{
+  g_return_if_fail (GTK_IS_FONT_CHOOSER (chooser));
 
-  populate_list (fontchooser,
-                 GTK_TREE_VIEW (priv->family_face_list),
-                 priv->model);
+  g_signal_emit (chooser, chooser_signals[SIGNAL_FONT_ACTIVATED], 0, fontname);
 }