From 7e74beec5b94254cb2bba8137e4e0569780d29ad Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 2 Aug 2018 20:54:21 -0400 Subject: [PATCH] Only use the portal color picker when appropriate This is just moving this check around. --- gtk/gtkcolorpickerportal.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gtk/gtkcolorpickerportal.c b/gtk/gtkcolorpickerportal.c index 429c414f4b..da567ae0b9 100644 --- a/gtk/gtkcolorpickerportal.c +++ b/gtk/gtkcolorpickerportal.c @@ -18,6 +18,7 @@ #include "config.h" #include "gtkcolorpickerportalprivate.h" +#include "gtkprivate.h" #include struct _GtkColorPickerPortal @@ -52,6 +53,9 @@ gtk_color_picker_portal_initable_init (GInitable *initable, GVariant *ret; guint version; + if (!gtk_should_use_portal ()) + return FALSE; + picker->portal_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_NONE, NULL, @@ -63,7 +67,7 @@ gtk_color_picker_portal_initable_init (GInitable *initable, if (picker->portal_proxy == NULL) { - g_debug ("Failed to create screnshot portal proxy"); + g_debug ("Failed to create screenshot portal proxy"); return FALSE; }