dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pickbutton: Add version check for XDG portal 

`PickColor()` API only got added in version 2, so check for that before
trying to use it.
This commit is contained in:
Niels De Graef 2022-04-10 15:31:27 +02:00
parent ff4e9c649a
commit e5caf21bcb
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libgimpwidgets/gimppickbutton-xdg.c
View File

@ -36,7 +36,9 @@
gboolean
_gimp_pick_button_xdg_available (void)
{
GDBusProxy *proxy = NULL;
gboolean ret = TRUE;
GDBusProxy *proxy = NULL;
GVariant *version = NULL;
proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
@ -46,24 +48,30 @@ _gimp_pick_button_xdg_available (void)
"org.freedesktop.portal.Screenshot",
NULL, NULL);
if (proxy)
if (proxy == NULL)
{
GError *error = NULL;
g_dbus_proxy_call_sync (proxy, "org.freedesktop.DBus.Peer.Ping",
NULL,
G_DBUS_CALL_FLAGS_NONE,
-1, NULL, &error);
if (! error)
return TRUE;
g_clear_error (&error);
g_object_unref (proxy);
proxy = NULL;
ret = FALSE;
goto out;
}
return FALSE;
/* Finally, PickColor is only available starting V2 of the portal */
version = g_dbus_proxy_get_cached_property (proxy, "version");
if (version == NULL)
{
ret = FALSE;
goto out;
}
if (g_variant_get_uint32 (version) < 2)
{
ret = FALSE;
goto out;
}
out:
g_clear_pointer (&version, g_variant_unref);
g_clear_object (&proxy);
return ret;
}
static void