diff options
| author | Pablo Barciela <[email protected]> | 2018-05-06 00:09:34 +0200 |
|---|---|---|
| committer | Pablo Barciela <[email protected]> | 2018-05-06 00:20:25 +0200 |
| commit | a3dfb665d34094f15c72b967974490df4ddad31b (patch) | |
| tree | c91c60a59b7b2662199f5439089c57dfb4d1ee05 | |
| parent | a28da51ba62baded1ea23e6ae9f4c907d443b242 (diff) | |
| download | pluma-a3dfb665d34094f15c72b967974490df4ddad31b.tar.bz2 pluma-a3dfb665d34094f15c72b967974490df4ddad31b.tar.xz | |
avoid deprecated 'gtk_font_button_set/get_font_name'
| -rw-r--r-- | pluma/dialogs/pluma-preferences-dialog.c | 10 | ||||
| -rw-r--r-- | pluma/pluma-print-job.c | 33 |
2 files changed, 20 insertions, 23 deletions
diff --git a/pluma/dialogs/pluma-preferences-dialog.c b/pluma/dialogs/pluma-preferences-dialog.c index 23b94ba4..5afacea5 100644 --- a/pluma/dialogs/pluma-preferences-dialog.c +++ b/pluma/dialogs/pluma-preferences-dialog.c @@ -539,17 +539,17 @@ default_font_font_checkbutton_toggled (GtkToggleButton *button, } static void -editor_font_button_font_set (GtkFontButton *font_button, +editor_font_button_font_set (GtkFontChooser *font_button, PlumaPreferencesDialog *dlg) { const gchar *font_name; pluma_debug (DEBUG_PREFS); - g_return_if_fail (font_button == GTK_FONT_BUTTON (dlg->priv->font_button)); + g_return_if_fail (font_button == GTK_FONT_CHOOSER (dlg->priv->font_button)); /* FIXME: Can this fail? Gtk docs are a bit terse... 21-02-2004 pbor */ - font_name = gtk_font_button_get_font_name (font_button); + font_name = gtk_font_chooser_get_font (font_button); if (!font_name) { g_warning ("Could not get font name"); @@ -594,8 +594,8 @@ setup_font_colors_page_font_section (PlumaPreferencesDialog *dlg) editor_font = pluma_prefs_manager_get_editor_font (); if (editor_font != NULL) { - gtk_font_button_set_font_name (GTK_FONT_BUTTON (dlg->priv->font_button), - editor_font); + gtk_font_chooser_set_font (GTK_FONT_CHOOSER (dlg->priv->font_button), + editor_font); g_free (editor_font); } diff --git a/pluma/pluma-print-job.c b/pluma/pluma-print-job.c index d26c7364..786cd697 100644 --- a/pluma/pluma-print-job.c +++ b/pluma/pluma-print-job.c @@ -273,9 +273,8 @@ restore_button_clicked (GtkButton *button, font = pluma_prefs_manager_get_default_print_font_body (); - gtk_font_button_set_font_name ( - GTK_FONT_BUTTON (job->priv->body_fontbutton), - font); + gtk_font_chooser_set_font (GTK_FONT_CHOOSER (job->priv->body_fontbutton), + font); g_free (font); } @@ -286,9 +285,8 @@ restore_button_clicked (GtkButton *button, font = pluma_prefs_manager_get_default_print_font_header (); - gtk_font_button_set_font_name ( - GTK_FONT_BUTTON (job->priv->headers_fontbutton), - font); + gtk_font_chooser_set_font (GTK_FONT_CHOOSER (job->priv->headers_fontbutton), + font); g_free (font); } @@ -299,9 +297,8 @@ restore_button_clicked (GtkButton *button, font = pluma_prefs_manager_get_default_print_font_numbers (); - gtk_font_button_set_font_name ( - GTK_FONT_BUTTON (job->priv->numbers_fontbutton), - font); + gtk_font_chooser_set_font (GTK_FONT_CHOOSER (job->priv->numbers_fontbutton), + font); g_free (font); } @@ -418,18 +415,18 @@ create_custom_widget_cb (GtkPrintOperation *operation, /* Set initial values */ font = pluma_prefs_manager_get_print_font_body (); - gtk_font_button_set_font_name (GTK_FONT_BUTTON (job->priv->body_fontbutton), - font); + gtk_font_chooser_set_font (GTK_FONT_CHOOSER (job->priv->body_fontbutton), + font); g_free (font); font = pluma_prefs_manager_get_print_font_header (); - gtk_font_button_set_font_name (GTK_FONT_BUTTON (job->priv->headers_fontbutton), - font); + gtk_font_chooser_set_font (GTK_FONT_CHOOSER (job->priv->headers_fontbutton), + font); g_free (font); font = pluma_prefs_manager_get_print_font_numbers (); - gtk_font_button_set_font_name (GTK_FONT_BUTTON (job->priv->numbers_fontbutton), - font); + gtk_font_chooser_set_font (GTK_FONT_CHOOSER (job->priv->numbers_fontbutton), + font); g_free (font); can_set = pluma_prefs_manager_print_font_body_can_set (); @@ -499,9 +496,9 @@ custom_widget_apply_cb (GtkPrintOperation *operation, } } - pluma_prefs_manager_set_print_font_body (gtk_font_button_get_font_name (GTK_FONT_BUTTON (job->priv->body_fontbutton))); - pluma_prefs_manager_set_print_font_header (gtk_font_button_get_font_name (GTK_FONT_BUTTON (job->priv->headers_fontbutton))); - pluma_prefs_manager_set_print_font_numbers (gtk_font_button_get_font_name (GTK_FONT_BUTTON (job->priv->numbers_fontbutton))); + pluma_prefs_manager_set_print_font_body (gtk_font_chooser_get_font (GTK_FONT_CHOOSER (job->priv->body_fontbutton))); + pluma_prefs_manager_set_print_font_header (gtk_font_chooser_get_font (GTK_FONT_CHOOSER (job->priv->headers_fontbutton))); + pluma_prefs_manager_set_print_font_numbers (gtk_font_chooser_get_font (GTK_FONT_CHOOSER (job->priv->numbers_fontbutton))); } static void |