diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2018-08-06 15:17:06 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2018-08-15 14:52:37 -0700 |
| commit | c1de6219ed78145e1d8f47bdfe708268c3645efe (patch) | |
| tree | 0c6544e7089ebb33ebb6c742663d8dd45c1dda4a /gtk/gtkfontchooserwidget.c | |
| parent | bbe362d015e4e389fb4ea23dc2e62530e64b5d19 (diff) | |
| download | gtk+-c1de6219ed78145e1d8f47bdfe708268c3645efe.tar.gz | |
font chooser: Remove an unneeded ifdef
We can just always create the axes hashtable.
Diffstat (limited to 'gtk/gtkfontchooserwidget.c')
| -rw-r--r-- | gtk/gtkfontchooserwidget.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c index 442bc81540..1b1be3d9a2 100644 --- a/gtk/gtkfontchooserwidget.c +++ b/gtk/gtkfontchooserwidget.c @@ -773,8 +773,6 @@ change_tweak (GSimpleAction *action, g_simple_action_set_state (action, state); } -#if defined(HAVE_HARFBUZZ) && defined(HAVE_PANGOFT) - typedef struct { guint32 tag; GtkAdjustment *adjustment; @@ -821,8 +819,6 @@ axis_free (gpointer v) g_free (a); } -#endif - static void gtk_font_chooser_widget_init (GtkFontChooserWidget *fontchooser) { @@ -835,9 +831,7 @@ gtk_font_chooser_widget_init (GtkFontChooserWidget *fontchooser) gtk_widget_init_template (GTK_WIDGET (fontchooser)); -#if defined(HAVE_HARFBUZZ) && defined(HAVE_PANGOFT) priv->axes = g_hash_table_new_full (axis_hash, axis_equal, NULL, axis_free); -#endif /* Default preview string */ priv->preview_text = g_strdup (pango_language_get_sample_string (NULL)); @@ -1189,8 +1183,7 @@ gtk_font_chooser_widget_finalize (GObject *object) g_list_free_full (priv->feature_items, g_free); - if (priv->axes) - g_hash_table_unref (priv->axes); + g_hash_table_unref (priv->axes); g_free (priv->font_features); |