[goffice] Fix criticals with Gtk+ >= 3.24.



commit 707ef820068214ef2d3574a22a75aaec7f9cceca
Author: Jean Brefort <jean brefort normalesup org>
Date:   Sat Jun 13 13:48:35 2020 +0200

    Fix criticals with Gtk+ >= 3.24.

 ChangeLog                        |  5 +++++
 goffice/gtk/go-font-sel-dialog.c | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)
---
diff --git a/ChangeLog b/ChangeLog
index 1f3c40aa..df4768ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-06-13  Jean Brefort  <jean brefort normalesup org>
+
+       * goffice/gtk/go-font-sel-dialog.c (gfsd_class_init): fix more
+       criticals with Gtk+ >= 3.24.
+
 2020-06-02  Jean Brefort  <jean brefort normalesup org>
 
        * goffice/graph/gog-grid-line.c (gog_grid_line_xy_render): clip grid lines
diff --git a/goffice/gtk/go-font-sel-dialog.c b/goffice/gtk/go-font-sel-dialog.c
index e2229f74..81b95a4f 100644
--- a/goffice/gtk/go-font-sel-dialog.c
+++ b/goffice/gtk/go-font-sel-dialog.c
@@ -44,6 +44,11 @@ enum {
        GFSD_GTK_FONT_CHOOSER_PROP_FONT_DESC,
        GFSD_GTK_FONT_CHOOSER_PROP_PREVIEW_TEXT,
        GFSD_GTK_FONT_CHOOSER_PROP_SHOW_PREVIEW_ENTRY,
+#if GTK_CHECK_VERSION(3,24,0)
+       GFSD_GTK_FONT_CHOOSER_PROP_LEVEL,
+       GFSD_GTK_FONT_CHOOSER_PROP_LANGUAGE,
+       GFSD_GTK_FONT_CHOOSER_PROP_FONT_FEATURES,
+#endif
        GFSD_GTK_FONT_CHOOSER_PROP_LAST
 };
 
@@ -127,6 +132,17 @@ gfsd_class_init (GObjectClass *klass)
        g_object_class_override_property (klass,
                                          GFSD_GTK_FONT_CHOOSER_PROP_SHOW_PREVIEW_ENTRY,
                                          "show-preview-entry");
+#if GTK_CHECK_VERSION(3,24,0)
+       g_object_class_override_property (klass,
+                                         GFSD_GTK_FONT_CHOOSER_PROP_LEVEL,
+                                         "level");
+       g_object_class_override_property (klass,
+                                         GFSD_GTK_FONT_CHOOSER_PROP_LANGUAGE,
+                                         "language");
+       g_object_class_override_property (klass,
+                                         GFSD_GTK_FONT_CHOOSER_PROP_FONT_FEATURES,
+                                         "font-features");
+#endif
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]