diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-08-30 11:01:55 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-08-30 11:01:55 -0400 |
| commit | a4f067481c53e9eef5172f39fcf5addcf6640bed (patch) | |
| tree | 115bb665b2cafbfc11b07fa2dae6aae658c0ec9f | |
| parent | 733fb527fa22d91e0d857856685200be4a123b01 (diff) | |
| download | gtk+-a4f067481c53e9eef5172f39fcf5addcf6640bed.tar.gz | |
gdk: Make GDK_DEBUG=default-settings unconditionaldefault-settings-non-debug
Our tests use this settings, so we should respect it
in non-debug builds as well.
| -rw-r--r-- | gdk/gdk.c | 2 | ||||
| -rw-r--r-- | gdk/wayland/gdkdisplay-wayland.c | 2 | ||||
| -rw-r--r-- | gdk/x11/gdkxftdefaults.c | 6 |
3 files changed, 5 insertions, 5 deletions
@@ -132,7 +132,7 @@ static const GdkDebugKey gdk_debug_keys[] = { { "gl-wgl", GDK_DEBUG_GL_WGL, "Use WGL on Windows" }, { "vulkan-disable", GDK_DEBUG_VULKAN_DISABLE, "Disable Vulkan support" }, { "vulkan-validate", GDK_DEBUG_VULKAN_VALIDATE, "Load the Vulkan validation layer" }, - { "default-settings",GDK_DEBUG_DEFAULT_SETTINGS, "Force default values for xsettings" }, + { "default-settings",GDK_DEBUG_DEFAULT_SETTINGS, "Force default values for xsettings", TRUE }, }; diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index 1860a73f78..4a5f633369 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -2117,7 +2117,7 @@ gdk_wayland_display_get_setting (GdkDisplay *display, { TranslationEntry *entry; - if (GDK_DISPLAY_DEBUG_CHECK (display, DEFAULT_SETTINGS)) + if (gdk_display_get_debug_flags (display) & GDK_DEBUG_DEFAULT_SETTINGS) return FALSE; if (GDK_WAYLAND_DISPLAY (display)->settings != NULL && diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c index a3a548227c..ef7580d4c0 100644 --- a/gdk/x11/gdkxftdefaults.c +++ b/gdk/x11/gdkxftdefaults.c @@ -89,7 +89,7 @@ get_boolean_default (GdkX11Screen *x11_screen, char *v; int i; - if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), DEFAULT_SETTINGS)) + if (gdk_display_get_debug_flags (GDK_SCREEN_DISPLAY (x11_screen)) & GDK_DEBUG_DEFAULT_SETTINGS) return FALSE; v = XGetDefault (dpy, "Xft", option); @@ -114,7 +114,7 @@ get_double_default (GdkX11Screen *x11_screen, Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen); char *v, *e; - if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), DEFAULT_SETTINGS)) + if (gdk_display_get_debug_flags (GDK_SCREEN_DISPLAY (x11_screen)) & GDK_DEBUG_DEFAULT_SETTINGS) return FALSE; v = XGetDefault (dpy, "Xft", option); @@ -141,7 +141,7 @@ get_integer_default (GdkX11Screen *x11_screen, Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen); char *v, *e; - if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), DEFAULT_SETTINGS)) + if (gdk_display_get_debug_flags (GDK_SCREEN_DISPLAY (x11_screen)) & GDK_DEBUG_DEFAULT_SETTINGS) return FALSE; v = XGetDefault (dpy, "Xft", option); |