[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 1a6a4614ce: Fix font options compilation with gsettings disabled
From: |
Po Lu |
Subject: |
master 1a6a4614ce: Fix font options compilation with gsettings disabled |
Date: |
Tue, 17 May 2022 06:16:06 -0400 (EDT) |
branch: master
commit 1a6a4614ceb9d868ccef023973eb7d28aae85b97
Author: Pieter van Prooijen <pieter.van.prooijen@teloden.nl>
Commit: Po Lu <luangruo@yahoo.com>
Fix font options compilation with gsettings disabled
* src/xsettings.c (xsettings_get_font_options): Return a font_options
even if gsettings is not enabled.
---
src/xsettings.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/xsettings.c b/src/xsettings.c
index 2e33ef958a..45341d8ebd 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -206,6 +206,11 @@ struct xsettings
unsigned seen;
};
+#ifdef HAVE_PGTK
+/* The cairo font_options as obtained using gsettings. */
+static cairo_font_options_t *font_options;
+#endif
+
#ifdef HAVE_GSETTINGS
#define GSETTINGS_SCHEMA "org.gnome.desktop.interface"
#define GSETTINGS_TOOL_BAR_STYLE "toolbar-style"
@@ -225,11 +230,6 @@ struct xsettings
static GSettings *gsettings_client;
-#ifdef HAVE_PGTK
-
-/* The cairo font_options as obtained using gsettings. */
-static cairo_font_options_t *font_options;
-
static bool
xg_settings_key_valid_p (GSettings *settings, const char *key)
{
@@ -253,6 +253,7 @@ xg_settings_key_valid_p (GSettings *settings, const char
*key)
#endif
}
+#ifdef HAVE_PGTK
/* Store an event for re-rendering of the fonts. */
static void
store_font_options_changed (void)
@@ -1206,7 +1207,11 @@ xsettings_get_system_normal_font (void)
cairo_font_options_t *
xsettings_get_font_options (void)
{
- return cairo_font_options_copy (font_options);
+ if (font_options != NULL)
+ return cairo_font_options_copy (font_options);
+ else
+ /* GSettings is not configured. */
+ return cairo_font_options_create ();
}
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 1a6a4614ce: Fix font options compilation with gsettings disabled,
Po Lu <=