[gtk+/font-selection-new: 1/73] GtkFontSelection: Remove all cruft from the current GtkFontSelection implementation

[Alberto Ruiz <aruiz src gnome org>]

commit ba79a9f5cfbf01e704a757a5e08fad1441d60e0d
Author: Alberto Ruiz <aruiz gnome org>
Date:   Fri Apr 15 21:07:32 2011 +0100

    GtkFontSelection: Remove all cruft from the current GtkFontSelection implementation

 gtk/gtkfontsel.c |  911 ++----------------------------------------------------
 1 files changed, 34 insertions(+), 877 deletions(-)
---
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index a022ed3..3fb7050 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -176,8 +176,6 @@ static void    gtk_font_selection_screen_changed     (GtkWidget	      *widget,
 static void    gtk_font_selection_style_updated      (GtkWidget      *widget);
 
 /* These are the callbacks & related functions. */
-static void     gtk_font_selection_select_font           (GtkTreeSelection *selection,
-							  gpointer          data);
 static void     gtk_font_selection_show_available_fonts  (GtkFontSelection *fs);
 
 static void     gtk_font_selection_show_available_styles (GtkFontSelection *fs);
@@ -197,9 +195,6 @@ static gboolean gtk_font_selection_size_focus_out        (GtkWidget        *w,
 static void     gtk_font_selection_select_size           (GtkTreeSelection *selection,
 							  gpointer          data);
 
-static void     gtk_font_selection_scroll_on_map         (GtkWidget        *w,
-							  gpointer          data);
-
 static void     gtk_font_selection_preview_changed       (GtkWidget        *entry,
 							  GtkFontSelection *fontsel);
 static void     gtk_font_selection_scroll_to_selection   (GtkFontSelection *fontsel);
@@ -207,7 +202,6 @@ static void     gtk_font_selection_scroll_to_selection   (GtkFontSelection *font
 
 /* Misc. utility functions. */
 static void    gtk_font_selection_load_font          (GtkFontSelection *fs);
-static void    gtk_font_selection_update_preview     (GtkFontSelection *fs);
 
 static PangoFontDescription *gtk_font_selection_get_font_description (GtkFontSelection *fontsel);
 static gboolean gtk_font_selection_select_font_desc  (GtkFontSelection      *fontsel,
@@ -349,63 +343,8 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
 
   gtk_box_set_spacing (GTK_BOX (fontsel), 12);
   priv->size = 12 * PANGO_SCALE;
-  
-  /* Create the table of font, style & size. */
-  table = gtk_table_new (3, 3, FALSE);
-  gtk_widget_show (table);
-  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
-  gtk_box_pack_start (GTK_BOX (fontsel), table, TRUE, TRUE, 0);
-
-#ifdef INCLUDE_FONT_ENTRIES
-  priv->font_entry = gtk_entry_new ();
-  gtk_editable_set_editable (GTK_EDITABLE (priv->font_entry), FALSE);
-  gtk_widget_set_size_request (priv->font_entry, 20, -1);
-  gtk_widget_show (priv->font_entry);
-  gtk_table_attach (GTK_TABLE (table), priv->font_entry, 0, 1, 1, 2,
-		    GTK_FILL, 0, 0, 0);
-  
-  priv->font_style_entry = gtk_entry_new ();
-  gtk_editable_set_editable (GTK_EDITABLE (priv->font_style_entry), FALSE);
-  gtk_widget_set_size_request (priv->font_style_entry, 20, -1);
-  gtk_widget_show (priv->font_style_entry);
-  gtk_table_attach (GTK_TABLE (table), priv->font_style_entry, 1, 2, 1, 2,
-		    GTK_FILL, 0, 0, 0);
-#endif /* INCLUDE_FONT_ENTRIES */
-  
   priv->size_entry = gtk_entry_new ();
-  gtk_widget_set_size_request (priv->size_entry, 20, -1);
-  gtk_widget_show (priv->size_entry);
-  gtk_table_attach (GTK_TABLE (table), priv->size_entry, 2, 3, 1, 2,
-		    GTK_FILL, 0, 0, 0);
-  g_signal_connect (priv->size_entry, "activate",
-		    G_CALLBACK (gtk_font_selection_size_activate),
-		    fontsel);
-  g_signal_connect_after (priv->size_entry, "focus-out-event",
-			  G_CALLBACK (gtk_font_selection_size_focus_out),
-			  fontsel);
-  
-  font_label = gtk_label_new_with_mnemonic (_("_Family:"));
-  gtk_misc_set_alignment (GTK_MISC (font_label), 0.0, 0.5);
-  gtk_widget_show (font_label);
-  gtk_table_attach (GTK_TABLE (table), font_label, 0, 1, 0, 1,
-		    GTK_FILL, 0, 0, 0);  
-
-  style_label = gtk_label_new_with_mnemonic (_("_Style:"));
-  gtk_misc_set_alignment (GTK_MISC (style_label), 0.0, 0.5);
-  gtk_widget_show (style_label);
-  gtk_table_attach (GTK_TABLE (table), style_label, 1, 2, 0, 1,
-		    GTK_FILL, 0, 0, 0);
-  
-  label = gtk_label_new_with_mnemonic (_("Si_ze:"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),
-                                 priv->size_entry);
-  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1,
-		    GTK_FILL, 0, 0, 0);
-  
-  
+    
   /* Create the lists  */
 
   model = gtk_list_store_new (2,
@@ -440,11 +379,8 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
   gtk_widget_show (priv->family_list);
   gtk_widget_show (scrolled_win);
 
-  gtk_table_attach (GTK_TABLE (table), scrolled_win, 0, 1, 1, 3,
-		    GTK_EXPAND | GTK_FILL,
-		    GTK_EXPAND | GTK_FILL, 0, 0);
-  focus_chain = g_list_append (focus_chain, scrolled_win);
-  
+  gtk_box_pack_start (GTK_BOX (fontsel), scrolled_win, TRUE, TRUE, 0);
+
   model = gtk_list_store_new (2,
 			      G_TYPE_OBJECT,  /* FACE_COLUMN */
 			      G_TYPE_STRING); /* FACE_NAME_COLUMN */
@@ -453,80 +389,12 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
   g_signal_connect (priv->face_list, "row-activated",
 		    G_CALLBACK (list_row_activated), fontsel);
 
-  gtk_label_set_mnemonic_widget (GTK_LABEL (style_label), priv->face_list);
-
-  column = gtk_tree_view_column_new_with_attributes ("Face",
-						     gtk_cell_renderer_text_new (),
-						     "text", FACE_NAME_COLUMN,
-						     NULL);
-  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (priv->face_list), column);
-
-  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->face_list), FALSE);
-  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->face_list)),
-			       GTK_SELECTION_BROWSE);
-  
-  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN);
-  gtk_widget_set_size_request (scrolled_win,
-			       FONT_STYLE_LIST_WIDTH, FONT_LIST_HEIGHT);
-  gtk_container_add (GTK_CONTAINER (scrolled_win), priv->face_list);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
-				  GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-  gtk_widget_show (priv->face_list);
-  gtk_widget_show (scrolled_win);
-  gtk_table_attach (GTK_TABLE (table), scrolled_win, 1, 2, 1, 3,
-		    GTK_EXPAND | GTK_FILL,
-		    GTK_EXPAND | GTK_FILL, 0, 0);
-  focus_chain = g_list_append (focus_chain, scrolled_win);
-  
-  focus_chain = g_list_append (focus_chain, priv->size_entry);
-
   model = gtk_list_store_new (1, G_TYPE_INT);
   priv->size_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
   g_object_unref (model);
   g_signal_connect (priv->size_list, "row-activated",
 		    G_CALLBACK (list_row_activated), fontsel);
-
-  column = gtk_tree_view_column_new_with_attributes ("Size",
-						     gtk_cell_renderer_text_new (),
-						     "text", SIZE_COLUMN,
-						     NULL);
-  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (priv->size_list), column);
-
-  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->size_list), FALSE);
-  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->size_list)),
-			       GTK_SELECTION_BROWSE);
-  
-  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN);
-  gtk_container_add (GTK_CONTAINER (scrolled_win), priv->size_list);
-  gtk_widget_set_size_request (scrolled_win, -1, FONT_LIST_HEIGHT);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
-				  GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-  gtk_widget_show (priv->size_list);
-  gtk_widget_show (scrolled_win);
-  gtk_table_attach (GTK_TABLE (table), scrolled_win, 2, 3, 2, 3,
-		    GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-  focus_chain = g_list_append (focus_chain, scrolled_win);
-
-  gtk_container_set_focus_chain (GTK_CONTAINER (table), focus_chain);
-  g_list_free (focus_chain);
   
-  /* Insert the fonts. */
-  g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->family_list)), "changed",
-		    G_CALLBACK (gtk_font_selection_select_font), fontsel);
-
-  g_signal_connect_after (priv->family_list, "map",
-			  G_CALLBACK (gtk_font_selection_scroll_on_map),
-			  fontsel);
-  
-  g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->face_list)), "changed",
-		    G_CALLBACK (gtk_font_selection_select_style), fontsel);
-
-  g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->size_list)), "changed",
-		    G_CALLBACK (gtk_font_selection_select_size), fontsel);
   atk_obj = gtk_widget_get_accessible (priv->size_list);
   if (GTK_IS_ACCESSIBLE (atk_obj))
     {
@@ -567,32 +435,6 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
         }
       g_object_unref (relation_set);
     }
-
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-  gtk_widget_show (vbox);
-  gtk_box_pack_start (GTK_BOX (fontsel), vbox, FALSE, TRUE, 0);
-  
-  /* create the text entry widget */
-  label = gtk_label_new_with_mnemonic (_("_Preview:"));
-  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
-
-  text_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_widget_show (text_box);
-  gtk_box_pack_start (GTK_BOX (vbox), text_box, FALSE, TRUE, 0);
-  
-  priv->preview_entry = gtk_entry_new ();
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->preview_entry);
-  gtk_entry_set_text (GTK_ENTRY (priv->preview_entry), _(PREVIEW_TEXT));
-  
-  gtk_widget_show (priv->preview_entry);
-  g_signal_connect (priv->preview_entry, "changed",
-		    G_CALLBACK (gtk_font_selection_preview_changed), fontsel);
-  gtk_widget_set_size_request (priv->preview_entry,
-			       -1, INITIAL_PREVIEW_HEIGHT);
-  gtk_box_pack_start (GTK_BOX (text_box), priv->preview_entry,
-		      TRUE, TRUE, 0);
   gtk_widget_pop_composite_child();
 }
 
@@ -625,54 +467,10 @@ gtk_font_selection_finalize (GObject *object)
 }
 
 static void
-gtk_font_selection_ref_family (GtkFontSelection *fontsel,
-			       PangoFontFamily  *family)
-{
-  GtkFontSelectionPrivate *priv = fontsel->priv;
-
-  if (family)
-    family = g_object_ref (family);
-  if (priv->family)
-    g_object_unref (priv->family);
-  priv->family = family;
-}
-
-static void gtk_font_selection_ref_face (GtkFontSelection *fontsel,
-					 PangoFontFace    *face)
-{
-  GtkFontSelectionPrivate *priv = fontsel->priv;
-
-  if (face)
-    face = g_object_ref (face);
-  if (priv->face)
-    g_object_unref (priv->face);
-  priv->face = face;
-}
-
-static void
-gtk_font_selection_reload_fonts (GtkFontSelection *fontsel)
-{
-  if (gtk_widget_has_screen (GTK_WIDGET (fontsel)))
-    {
-      PangoFontDescription *desc;
-      desc = gtk_font_selection_get_font_description (fontsel);
-
-      gtk_font_selection_show_available_fonts (fontsel);
-      gtk_font_selection_show_available_sizes (fontsel, TRUE);
-      gtk_font_selection_show_available_styles (fontsel);
-
-      gtk_font_selection_select_font_desc (fontsel, desc, NULL, NULL);
-      gtk_font_selection_scroll_to_selection (fontsel);
-
-      pango_font_description_free (desc);
-    }
-}
-
-static void
 gtk_font_selection_screen_changed (GtkWidget *widget,
-				   GdkScreen *previous_screen)
+                                  GdkScreen *previous_screen)
 {
-  gtk_font_selection_reload_fonts (GTK_FONT_SELECTION (widget));
+  return;
 }
 
 static void
@@ -680,538 +478,35 @@ gtk_font_selection_style_updated (GtkWidget *widget)
 {
   GTK_WIDGET_CLASS (gtk_font_selection_parent_class)->style_updated (widget);
 
-  /* Maybe fonts where installed or removed... */
-  gtk_font_selection_reload_fonts (GTK_FONT_SELECTION (widget));
-}
-
-static void
-gtk_font_selection_preview_changed (GtkWidget        *entry,
-				    GtkFontSelection *fontsel)
-{
-  g_object_notify (G_OBJECT (fontsel), "preview-text");
-}
-
-static void
-scroll_to_selection (GtkTreeView *tree_view)
-{
-  GtkTreeSelection *selection = gtk_tree_view_get_selection (tree_view);
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-
-  if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    {
-      GtkTreePath *path = gtk_tree_model_get_path (model, &iter);
-      gtk_tree_view_scroll_to_cell (tree_view, path, NULL, TRUE, 0.5, 0.5);
-      gtk_tree_path_free (path);
-    }
-}
-
-static void
-set_cursor_to_iter (GtkTreeView *view,
-		    GtkTreeIter *iter)
-{
-  GtkTreeModel *model = gtk_tree_view_get_model (view);
-  GtkTreePath *path = gtk_tree_model_get_path (model, iter);
-  
-  gtk_tree_view_set_cursor (view, path, NULL, FALSE);
-
-  gtk_tree_path_free (path);
-}
-
-static void
-gtk_font_selection_scroll_to_selection (GtkFontSelection *fontsel)
-{
-  GtkFontSelectionPrivate *priv = fontsel->priv;
-
-  /* Try to scroll the font family list to the selected item */
-  scroll_to_selection (GTK_TREE_VIEW (priv->family_list));
-
-  /* Try to scroll the font family list to the selected item */
-  scroll_to_selection (GTK_TREE_VIEW (priv->face_list));
-
-  /* Try to scroll the font family list to the selected item */
-  scroll_to_selection (GTK_TREE_VIEW (priv->size_list));
-/* This is called when the list is mapped. Here we scroll to the current
-   font if necessary. */
-}
-
-static void
-gtk_font_selection_scroll_on_map (GtkWidget		*widget,
-                                  gpointer		 data)
-{
-  gtk_font_selection_scroll_to_selection (GTK_FONT_SELECTION (data));
-}
-
-/* This is called when a family is selected in the list. */
-static void
-gtk_font_selection_select_font (GtkTreeSelection *selection,
-				gpointer          data)
-{
-  GtkFontSelection *fontsel;
-  GtkFontSelectionPrivate *priv;
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-#ifdef INCLUDE_FONT_ENTRIES
-  const gchar *family_name;
-#endif
-
-  fontsel = GTK_FONT_SELECTION (data);
-  priv = fontsel->priv;
-
-  if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    {
-      PangoFontFamily *family;
-
-      gtk_tree_model_get (model, &iter, FAMILY_COLUMN, &family, -1);
-      if (priv->family != family)
-	{
-	  gtk_font_selection_ref_family (fontsel, family);
-
-#ifdef INCLUDE_FONT_ENTRIES
-	  family_name = pango_font_family_get_name (priv->family);
-	  gtk_entry_set_text (GTK_ENTRY (priv->font_entry), family_name);
-#endif
-
-	  gtk_font_selection_show_available_styles (fontsel);
-	  gtk_font_selection_select_best_style (fontsel, TRUE);
-	}
-
-      g_object_unref (family);
-    }
-}
-
-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
-gtk_font_selection_show_available_fonts (GtkFontSelection *fontsel)
-{
-  GtkFontSelectionPrivate *priv = fontsel->priv;
-  GtkListStore *model;
-  PangoFontFamily **families;
-  PangoFontFamily *match_family = NULL;
-  gint n_families, i;
-  GtkTreeIter match_row;
-
-  model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->family_list)));
-
-  pango_context_list_families (gtk_widget_get_pango_context (GTK_WIDGET (fontsel)),
-			       &families, &n_families);
-  qsort (families, n_families, sizeof (PangoFontFamily *), cmp_families);
-
-  gtk_list_store_clear (model);
-
-  for (i=0; i<n_families; i++)
-    {
-      const gchar *name = pango_font_family_get_name (families[i]);
-      GtkTreeIter iter;
-
-      gtk_list_store_append (model, &iter);
-      gtk_list_store_set (model, &iter,
-			  FAMILY_COLUMN, families[i],
-			  FAMILY_NAME_COLUMN, name,
-			  -1);
-      
-      if (i == 0 || !g_ascii_strcasecmp (name, "sans"))
-	{
-	  match_family = families[i];
-	  match_row = iter;
-	}
-    }
-
-  gtk_font_selection_ref_family (fontsel, match_family);
-  if (match_family)
-    {
-      set_cursor_to_iter (GTK_TREE_VIEW (priv->family_list), &match_row);
-#ifdef INCLUDE_FONT_ENTRIES
-      gtk_entry_set_text (GTK_ENTRY (priv->font_entry), 
-			  pango_font_family_get_name (match_family));
-#endif /* INCLUDE_FONT_ENTRIES */
-    }
-
-  g_free (families);
-}
-
-static int
-compare_font_descriptions (const PangoFontDescription *a, const PangoFontDescription *b)
-{
-  int val = strcmp (pango_font_description_get_family (a), pango_font_description_get_family (b));
-  if (val != 0)
-    return val;
-
-  if (pango_font_description_get_weight (a) != pango_font_description_get_weight (b))
-    return pango_font_description_get_weight (a) - pango_font_description_get_weight (b);
-
-  if (pango_font_description_get_style (a) != pango_font_description_get_style (b))
-    return pango_font_description_get_style (a) - pango_font_description_get_style (b);
-  
-  if (pango_font_description_get_stretch (a) != pango_font_description_get_stretch (b))
-    return pango_font_description_get_stretch (a) - pango_font_description_get_stretch (b);
-
-  if (pango_font_description_get_variant (a) != pango_font_description_get_variant (b))
-    return pango_font_description_get_variant (a) - pango_font_description_get_variant (b);
-
-  return 0;
-}
-
-static int
-faces_sort_func (const void *a, const void *b)
-{
-  PangoFontDescription *desc_a = pango_font_face_describe (*(PangoFontFace **)a);
-  PangoFontDescription *desc_b = pango_font_face_describe (*(PangoFontFace **)b);
-  
-  int ord = compare_font_descriptions (desc_a, desc_b);
-
-  pango_font_description_free (desc_a);
-  pango_font_description_free (desc_b);
-
-  return ord;
-}
-
-static gboolean
-font_description_style_equal (const PangoFontDescription *a,
-			      const PangoFontDescription *b)
-{
-  return (pango_font_description_get_weight (a) == pango_font_description_get_weight (b) &&
-	  pango_font_description_get_style (a) == pango_font_description_get_style (b) &&
-	  pango_font_description_get_stretch (a) == pango_font_description_get_stretch (b) &&
-	  pango_font_description_get_variant (a) == pango_font_description_get_variant (b));
-}
-
-/* This fills the font style list with all the possible style combinations
-   for the current font family. */
-static void
-gtk_font_selection_show_available_styles (GtkFontSelection *fontsel)
-{
-  GtkFontSelectionPrivate *priv = fontsel->priv;
-  gint n_faces, i;
-  PangoFontFace **faces;
-  PangoFontDescription *old_desc;
-  GtkListStore *model;
-  GtkTreeIter match_row;
-  PangoFontFace *match_face = NULL;
-
-  model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->face_list)));
-
-  if (priv->face)
-    old_desc = pango_font_face_describe (priv->face);
-  else
-    old_desc= NULL;
-
-  pango_font_family_list_faces (priv->family, &faces, &n_faces);
-  qsort (faces, n_faces, sizeof (PangoFontFace *), faces_sort_func);
-
-  gtk_list_store_clear (model);
-
-  for (i=0; i < n_faces; i++)
-    {
-      GtkTreeIter iter;
-      const gchar *str = pango_font_face_get_face_name (faces[i]);
-
-      gtk_list_store_append (model, &iter);
-      gtk_list_store_set (model, &iter,
-			  FACE_COLUMN, faces[i],
-			  FACE_NAME_COLUMN, str,
-			  -1);
-
-      if (i == 0)
-	{
-	  match_row = iter;
-	  match_face = faces[i];
-	}
-      else if (old_desc)
-	{
-	  PangoFontDescription *tmp_desc = pango_font_face_describe (faces[i]);
-	  
-	  if (font_description_style_equal (tmp_desc, old_desc))
-	    {
-	      match_row = iter;
-	      match_face = faces[i];
-	    }
-      
-	  pango_font_description_free (tmp_desc);
-	}
-    }
-
-  if (old_desc)
-    pango_font_description_free (old_desc);
-
-  gtk_font_selection_ref_face (fontsel, match_face);
-  if (match_face)
-    {
-#ifdef INCLUDE_FONT_ENTRIES
-      const gchar *str = pango_font_face_get_face_name (priv->face);
-
-      gtk_entry_set_text (GTK_ENTRY (priv->font_style_entry), str);
-#endif
-      set_cursor_to_iter (GTK_TREE_VIEW (priv->face_list), &match_row);
-    }
-
-  g_free (faces);
-}
-
-/* This selects a style when the user selects a font. It just uses the first
-   available style at present. I was thinking of trying to maintain the
-   selected style, e.g. bold italic, when the user selects different fonts.
-   However, the interface is so easy to use now I'm not sure it's worth it.
-   Note: This will load a font. */
-static void
-gtk_font_selection_select_best_style (GtkFontSelection *fontsel,
-				      gboolean	        use_first)
-{
-  GtkFontSelectionPrivate *priv = fontsel->priv;
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-
-  model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->face_list));
-
-  if (gtk_tree_model_get_iter_first (model, &iter))
-    {
-      set_cursor_to_iter (GTK_TREE_VIEW (priv->face_list), &iter);
-      scroll_to_selection (GTK_TREE_VIEW (priv->face_list));
-    }
-
-  gtk_font_selection_show_available_sizes (fontsel, FALSE);
-  gtk_font_selection_select_best_size (fontsel);
-}
-
-
-/* This is called when a style is selected in the list. */
-static void
-gtk_font_selection_select_style (GtkTreeSelection *selection,
-				 gpointer          data)
-{
-  GtkFontSelection *fontsel = GTK_FONT_SELECTION (data);
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-
-  if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    {
-      PangoFontFace *face;
-      
-      gtk_tree_model_get (model, &iter, FACE_COLUMN, &face, -1);
-      gtk_font_selection_ref_face (fontsel, face);
-      g_object_unref (face);
-    }
-
-  gtk_font_selection_show_available_sizes (fontsel, FALSE);
-  gtk_font_selection_select_best_size (fontsel);
+  return;
 }
 
 static void
-gtk_font_selection_show_available_sizes (GtkFontSelection *fontsel,
-					 gboolean          first_time)
-{
-  GtkFontSelectionPrivate *priv = fontsel->priv;
-  gint i;
-  GtkListStore *model;
-  gchar buffer[128];
-  gchar *p;
-
-  model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->size_list)));
-
-  /* Insert the standard font sizes */
-  if (first_time)
-    {
-      gtk_list_store_clear (model);
-
-      for (i = 0; i < G_N_ELEMENTS (font_sizes); i++)
-	{
-	  GtkTreeIter iter;
-
-	  gtk_list_store_append (model, &iter);
-	  gtk_list_store_set (model, &iter, SIZE_COLUMN, font_sizes[i], -1);
-
-	  if (font_sizes[i] * PANGO_SCALE == priv->size)
-	    set_cursor_to_iter (GTK_TREE_VIEW (priv->size_list), &iter);
-	}
-    }
-  else
-    {
-      GtkTreeIter iter;
-      gboolean found = FALSE;
-
-      gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter);
-      for (i = 0; i < G_N_ELEMENTS (font_sizes) && !found; i++)
-	{
-	  if (font_sizes[i] * PANGO_SCALE == priv->size)
-	    {
-	      set_cursor_to_iter (GTK_TREE_VIEW (priv->size_list), &iter);
-	      found = TRUE;
-	    }
-
-	  gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter);
-	}
-
-      if (!found)
-	{
-	  GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->size_list));
-	  gtk_tree_selection_unselect_all (selection);
-	}
-    }
-
-  /* Set the entry to the new size, rounding to 1 digit,
-   * trimming of trailing 0's and a trailing period
-   */
-  g_snprintf (buffer, sizeof (buffer), "%.1f", priv->size / (1.0 * PANGO_SCALE));
-  if (strchr (buffer, '.'))
-    {
-      p = buffer + strlen (buffer) - 1;
-      while (*p == '0')
-	p--;
-      if (*p == '.')
-	p--;
-      p[1] = '\0';
-    }
-
-  /* Compare, to avoid moving the cursor unecessarily */
-  if (strcmp (gtk_entry_get_text (GTK_ENTRY (priv->size_entry)), buffer) != 0)
-    gtk_entry_set_text (GTK_ENTRY (priv->size_entry), buffer);
-}
-
-static void
-gtk_font_selection_select_best_size (GtkFontSelection *fontsel)
-{
-  gtk_font_selection_load_font (fontsel);  
-}
-
-static void
-gtk_font_selection_set_size (GtkFontSelection *fontsel,
-			     gint              new_size)
-{
-  GtkFontSelectionPrivate *priv = fontsel->priv;
-
-  if (priv->size != new_size)
-    {
-      priv->size = new_size;
-
-      gtk_font_selection_show_available_sizes (fontsel, FALSE);      
-      gtk_font_selection_load_font (fontsel);
-    }
-}
-
-/* If the user hits return in the font size entry, we change to the new font
-   size. */
-static void
-gtk_font_selection_size_activate (GtkWidget   *w,
-                                  gpointer     data)
-{
-  GtkFontSelection *fontsel = GTK_FONT_SELECTION (data);
-  GtkFontSelectionPrivate *priv = fontsel->priv;
-  gint new_size;
-  const gchar *text;
-
-  text = gtk_entry_get_text (GTK_ENTRY (priv->size_entry));
-  new_size = MAX (0.1, atof (text) * PANGO_SCALE + 0.5);
-
-  if (priv->size != new_size)
-    gtk_font_selection_set_size (fontsel, new_size);
-  else 
-    list_row_activated (w);
-}
-
-static gboolean
-gtk_font_selection_size_focus_out (GtkWidget     *w,
-				   GdkEventFocus *event,
-				   gpointer       data)
+gtk_font_selection_ref_family (GtkFontSelection *fontsel,
+                              PangoFontFamily  *family)
 {
-  GtkFontSelection *fontsel = GTK_FONT_SELECTION (data);
   GtkFontSelectionPrivate *priv = fontsel->priv;
-  gint new_size;
-  const gchar *text;
-
-  text = gtk_entry_get_text (GTK_ENTRY (priv->size_entry));
-  new_size = MAX (0.1, atof (text) * PANGO_SCALE + 0.5);
-
-  gtk_font_selection_set_size (fontsel, new_size);
-
-  return TRUE;
-}
 
-/* This is called when a size is selected in the list. */
-static void
-gtk_font_selection_select_size (GtkTreeSelection *selection,
-				gpointer          data)
-{
-  GtkFontSelection *fontsel = GTK_FONT_SELECTION (data);
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-  gint new_size;
-
-  if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    {
-      gtk_tree_model_get (model, &iter, SIZE_COLUMN, &new_size, -1);
-      gtk_font_selection_set_size (fontsel, new_size * PANGO_SCALE);
-    }
+  if (family)
+    family = g_object_ref (family);
+  if (priv->family)
+    g_object_unref (priv->family);
+  priv->family = family;
 }
 
 static void
-gtk_font_selection_load_font (GtkFontSelection *fontsel)
-{
-  gtk_font_selection_update_preview (fontsel);
-}
-
-static PangoFontDescription *
-gtk_font_selection_get_font_description (GtkFontSelection *fontsel)
+gtk_font_selection_ref_face (GtkFontSelection *fontsel,
+                                        PangoFontFace    *face)
 {
   GtkFontSelectionPrivate *priv = fontsel->priv;
-  PangoFontDescription *font_desc;
 
+  if (face)
+    face = g_object_ref (face);
   if (priv->face)
-    {
-      font_desc = pango_font_face_describe (priv->face);
-      pango_font_description_set_size (font_desc, priv->size);
-    }
-  else
-    font_desc = pango_font_description_from_string (DEFAULT_FONT_NAME);
-
-  return font_desc;
-}
-
-/* This sets the font in the preview entry to the selected font,
- * and tries to make sure that the preview entry is a reasonable
- * size, i.e. so that the text can be seen with a bit of space to
- * spare. But it tries to avoid resizing the entry every time the
- * font changes. This also used to shrink the preview if the font
- * size was decreased, but that made it awkward if the user wanted
- * to resize the window themself.
- */
-static void
-gtk_font_selection_update_preview (GtkFontSelection *fontsel)
-{
-  GtkFontSelectionPrivate *priv = fontsel->priv;
-  gint new_height;
-  GtkRequisition old_requisition, new_requisition;
-  GtkWidget *preview_entry = priv->preview_entry;
-  const gchar *text;
-
-  gtk_widget_get_preferred_size (preview_entry, &old_requisition, NULL);
-
-  gtk_widget_override_font (preview_entry,
-                            gtk_font_selection_get_font_description (fontsel));
-
-  gtk_widget_get_preferred_size (preview_entry, &new_requisition, NULL);
-
-  /* We don't ever want to be over MAX_PREVIEW_HEIGHT pixels high. */
-  new_height = CLAMP (new_requisition.height, INITIAL_PREVIEW_HEIGHT, MAX_PREVIEW_HEIGHT);
-
-  if (new_height > old_requisition.height || new_height < old_requisition.height - 30)
-    gtk_widget_set_size_request (preview_entry, -1, new_height);
-
-  /* This sets the preview text, if it hasn't been set already. */
-  text = gtk_entry_get_text (GTK_ENTRY (preview_entry));
-  if (strlen (text) == 0)
-    gtk_entry_set_text (GTK_ENTRY (preview_entry), _(PREVIEW_TEXT));
-  gtk_editable_set_position (GTK_EDITABLE (preview_entry), 0);
+    g_object_unref (priv->face);
+  priv->face = face;
 }
 
-
 /*****************************************************************************
  * These functions are the main public interface for getting/setting the font.
  *****************************************************************************/
@@ -1225,14 +520,14 @@ gtk_font_selection_update_preview (GtkFontSelection *fontsel)
  *
  * Return value: (transfer none): A #GtkWidget that is part of @fontsel
  *
- * Since: 2.14
+ * Deprecated: 3.2
  */
 GtkWidget *
 gtk_font_selection_get_family_list (GtkFontSelection *fontsel)
 {
   g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
 
-  return fontsel->priv->family_list;
+  return NULL;
 }
 
 /**
@@ -1244,14 +539,14 @@ gtk_font_selection_get_family_list (GtkFontSelection *fontsel)
  * 
  * Return value: (transfer none): A #GtkWidget that is part of @fontsel
  *
- * Since: 2.14
+ * Deprecated: 3.2
  */
 GtkWidget *
 gtk_font_selection_get_face_list (GtkFontSelection *fontsel)
 {
   g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
 
-  return fontsel->priv->face_list;
+  return NULL;
 }
 
 /**
@@ -1263,14 +558,14 @@ gtk_font_selection_get_face_list (GtkFontSelection *fontsel)
  *
  * Return value: (transfer none): A #GtkWidget that is part of @fontsel
  *
- * Since: 2.14
+ * Deprecated: 3.2
  */
 GtkWidget *
 gtk_font_selection_get_size_entry (GtkFontSelection *fontsel)
 {
   g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
 
-  return fontsel->priv->size_entry;
+  return NULL;
 }
 
 /**
@@ -1281,14 +576,14 @@ gtk_font_selection_get_size_entry (GtkFontSelection *fontsel)
  *
  * Return value: (transfer none): A #GtkWidget that is part of @fontsel
  *
- * Since: 2.14
+ * Deprecated: 3.2
  */
 GtkWidget *
 gtk_font_selection_get_size_list (GtkFontSelection *fontsel)
 {
   g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
 
-  return fontsel->priv->size_list;
+  return NULL;
 }
 
 /**
@@ -1299,14 +594,14 @@ gtk_font_selection_get_size_list (GtkFontSelection *fontsel)
  *
  * Return value: (transfer none): A #GtkWidget that is part of @fontsel
  *
- * Since: 2.14
+ * Deprecated: 3.2
  */
 GtkWidget *
 gtk_font_selection_get_preview_entry (GtkFontSelection *fontsel)
 {
   g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
 
-  return fontsel->priv->preview_entry;
+  return NULL;
 }
 
 /**
@@ -1327,7 +622,7 @@ gtk_font_selection_get_family (GtkFontSelection *fontsel)
 {
   g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
 
-  return fontsel->priv->family;
+  return NULL;
 }
 
 /**
@@ -1348,7 +643,7 @@ gtk_font_selection_get_face (GtkFontSelection *fontsel)
 {
   g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
 
-  return fontsel->priv->face;
+  return NULL;
 }
 
 /**
@@ -1367,7 +662,7 @@ gtk_font_selection_get_size (GtkFontSelection *fontsel)
 {
   g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), -1);
 
-  return fontsel->priv->size;
+  return NULL;
 }
 
 /**
@@ -1389,119 +684,9 @@ gtk_font_selection_get_size (GtkFontSelection *fontsel)
 gchar *
 gtk_font_selection_get_font_name (GtkFontSelection *fontsel)
 {
-  gchar *result;
-  
-  PangoFontDescription *font_desc = gtk_font_selection_get_font_description (fontsel);
-  result = pango_font_description_to_string (font_desc);
-  pango_font_description_free (font_desc);
-
-  return result;
+  return NULL;
 }
 
-/* This selects the appropriate list rows.
-   First we check the fontname is valid and try to find the font family
-   - i.e. the name in the main list. If we can't find that, then just return.
-   Next we try to set each of the properties according to the fontname.
-   Finally we select the font family & style in the lists. */
-static gboolean
-gtk_font_selection_select_font_desc (GtkFontSelection      *fontsel,
-				     PangoFontDescription  *new_desc,
-				     PangoFontFamily      **pfamily,
-				     PangoFontFace        **pface)
-{
-  GtkFontSelectionPrivate *priv = fontsel->priv;
-  PangoFontFamily *new_family = NULL;
-  PangoFontFace *new_face = NULL;
-  PangoFontFace *fallback_face = NULL;
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-  GtkTreeIter match_iter;
-  gboolean valid;
-  const gchar *new_family_name;
-
-  new_family_name = pango_font_description_get_family (new_desc);
-
-  if (!new_family_name)
-    return FALSE;
-
-  /* Check to make sure that this is in the list of allowed fonts 
-   */
-  model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->family_list));
-  for (valid = gtk_tree_model_get_iter_first (model, &iter);
-       valid;
-       valid = gtk_tree_model_iter_next (model, &iter))
-    {
-      PangoFontFamily *family;
-      
-      gtk_tree_model_get (model, &iter, FAMILY_COLUMN, &family, -1);
-      
-      if (g_ascii_strcasecmp (pango_font_family_get_name (family),
-			      new_family_name) == 0)
-	new_family = g_object_ref (family);
-
-      g_object_unref (family);
-      
-      if (new_family)
-	break;
-    }
-
-  if (!new_family)
-    return FALSE;
-
-  if (pfamily)
-    *pfamily = new_family;
-  else
-    g_object_unref (new_family);
-  set_cursor_to_iter (GTK_TREE_VIEW (priv->family_list), &iter);
-  gtk_font_selection_show_available_styles (fontsel);
-
-  model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->face_list));
-  for (valid = gtk_tree_model_get_iter_first (model, &iter);
-       valid;
-       valid = gtk_tree_model_iter_next (model, &iter))
-    {
-      PangoFontFace *face;
-      PangoFontDescription *tmp_desc;
-      
-      gtk_tree_model_get (model, &iter, FACE_COLUMN, &face, -1);
-      tmp_desc = pango_font_face_describe (face);
-      
-      if (font_description_style_equal (tmp_desc, new_desc))
-	new_face = g_object_ref (face);
-      
-      if (!fallback_face)
-	{
-	  fallback_face = g_object_ref (face);
-	  match_iter = iter;
-	}
-      
-      pango_font_description_free (tmp_desc);
-      g_object_unref (face);
-      
-      if (new_face)
-	{
-	  match_iter = iter;
-	  break;
-	}
-    }
-
-  if (!new_face)
-    new_face = fallback_face;
-  else if (fallback_face)
-    g_object_unref (fallback_face);
-
-  if (pface)
-    *pface = new_face;
-  else if (new_face)
-    g_object_unref (new_face);
-  set_cursor_to_iter (GTK_TREE_VIEW (priv->face_list), &match_iter);  
-
-  gtk_font_selection_set_size (fontsel, pango_font_description_get_size (new_desc));
-
-  return TRUE;
-}
-
-
 /* This sets the current font, then selecting the appropriate list rows. */
 
 /**
@@ -1529,26 +714,6 @@ gtk_font_selection_set_font_name (GtkFontSelection *fontsel,
   
   g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), FALSE);
 
-  if (!gtk_widget_has_screen (GTK_WIDGET (fontsel)))
-    return FALSE;
-
-  new_desc = pango_font_description_from_string (fontname);
-
-  if (gtk_font_selection_select_font_desc (fontsel, new_desc, &family, &face))
-    {
-      gtk_font_selection_ref_family (fontsel, family);
-      if (family)
-        g_object_unref (family);
-
-      gtk_font_selection_ref_face (fontsel, face);
-      if (face)
-        g_object_unref (face);
-    }
-
-  pango_font_description_free (new_desc);
-  
-  g_object_notify (G_OBJECT (fontsel), "font-name");
-
   return TRUE;
 }
 
@@ -1565,13 +730,7 @@ gtk_font_selection_set_font_name (GtkFontSelection *fontsel,
 G_CONST_RETURN gchar*
 gtk_font_selection_get_preview_text (GtkFontSelection *fontsel)
 {
-  GtkFontSelectionPrivate *priv;
-
-  g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
-
-  priv = fontsel->priv;
-
-  return gtk_entry_get_text (GTK_ENTRY (priv->preview_entry));
+  return NULL;
 }
 
 
@@ -1593,8 +752,6 @@ gtk_font_selection_set_preview_text  (GtkFontSelection *fontsel,
   g_return_if_fail (text != NULL);
 
   priv = fontsel->priv;
-
-  gtk_entry_set_text (GTK_ENTRY (priv->preview_entry), text);
 }