colorpickerportal: Simplify portal version fetching

This commit is contained in:
Bastien Nocera
2020-03-23 14:46:49 +01:00
parent 7b1b3fa0cb
commit 4c71bf74f1

View File

@ -49,8 +49,8 @@ gtk_color_picker_portal_initable_init (GInitable *initable,
GError **error)
{
GtkColorPickerPortal *picker = GTK_COLOR_PICKER_PORTAL (initable);
char *owner;
GVariant *ret;
g_autofree char *owner = NULL;
g_autoptr(GVariant) ret = NULL;
guint version;
if (!gtk_should_use_portal ())
@ -71,18 +71,16 @@ gtk_color_picker_portal_initable_init (GInitable *initable,
return FALSE;
}
owner = g_dbus_proxy_get_name_owner (picker->portal_proxy);
owner = g_dbus_proxy_get_name_owner (picker->portal_proxy);
if (owner == NULL)
{
g_debug ("org.freedesktop.portal.Screenshot not provided");
g_clear_object (&picker->portal_proxy);
return FALSE;
}
g_free (owner);
ret = g_dbus_proxy_get_cached_property (picker->portal_proxy, "version");
version = g_variant_get_uint32 (ret);
g_variant_unref (ret);
if (version != 2)
{
g_debug ("Screenshot portal version: %u", version);