Use GtkFontChooser if GTK >= 3.2

svn path=/trunk/; revision=42205

diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c
index 41205f3e93f78117391323bb9aeb32fbcf56e089..479c3b2e39a80abd7e41907ab1cdd83aa0dfee9d 100644 (file)
--- a/ui/gtk/prefs_dlg.c
+++ b/ui/gtk/prefs_dlg.c
@@ -538,10 +538,12 @@ prefs_page_cb(GtkWidget *w _U_, gpointer dummy _U_, PREFS_PAGE_E prefs_page)
 
   /* We set the current font now, because setting it appears not to work
      when run before appending the frame to the notebook. */
-
+#if GTK_CHECK_VERSION(3,2,0)
+  gtk_font_chooser_set_font(GTK_FONT_CHOOSER(gui_font_pg), prefs.gui_font_name);
+#else
   gtk_font_selection_set_font_name(
     GTK_FONT_SELECTION(gui_font_pg), prefs.gui_font_name);
-
+#endif /* GTK_CHECK_VERSION(3,2,0) */
   /* GUI Colors prefs */
   g_strlcpy(label_str, "Colors", MAX_TREE_NODE_NAME_LEN);
   prefs_nb_page_add(prefs_nb, label_str, stream_prefs_show(), E_GUI_COLORS_PAGE_KEY);

diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c
index 8036507ee9666ca0448ab830fb0dc5a55fa8e997..e24a694e3f37e22f266794f77b09b2a428a0eba1 100644 (file)
--- a/ui/gtk/prefs_gui.c
+++ b/ui/gtk/prefs_gui.c
@@ -380,7 +380,11 @@ GtkWidget *
 gui_font_prefs_show(void)
 {
        /* Create the font selection widget. */
+#if GTK_CHECK_VERSION(3,2,0)
+       font_browse_w = gtk_font_chooser_widget_new();
+#else
        font_browse_w = (GtkWidget *) gtk_font_selection_new();
+#endif /* GTK_CHECK_VERSION(3,2,0) */
        gtk_widget_show(font_browse_w);
 
        return font_browse_w;
@@ -392,8 +396,14 @@ font_fetch(void)
 {
        gchar   *font_name;
 
+
+#if GTK_CHECK_VERSION(3,2,0)
+       font_name = g_strdup(gtk_font_chooser_get_font(
+             GTK_FONT_CHOOSER(font_browse_w)));
+#else
        font_name = g_strdup(gtk_font_selection_get_font_name(
              GTK_FONT_SELECTION(font_browse_w)));
+#endif /* GTK_CHECK_VERSION(3,2,0) */
        if (font_name == NULL) {
                /* No font was selected; let the user know, but don't
                   tear down the font selection dialog, so they can