Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

colorpickerportal: Simplify version fetching code

Browse Source 
Simplify version checking code by using a function to fetch the uint out
of the GVariant and don't throw a warning if it can't be fetched.
This commit is contained in:
Bastien Nocera
2020-03-23 14:45:57 +01:00
parent da47ccaf3c
commit bd55c5842e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkcolorpickerportal.c
View File

@@ -51,7 +51,7 @@ gtk_color_picker_portal_initable_init (GInitable *initable,
GtkColorPickerPortal *picker = GTK_COLOR_PICKER_PORTAL (initable);
char *owner;
GVariant *ret;
guint version;
guint version = 0;
if (!gdk_should_use_portal ())
return FALSE;
@@ -71,7 +71,7 @@ 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 ("%s not provided", PORTAL_SCREENSHOT_INTERFACE);
@@ -81,8 +81,12 @@ gtk_color_picker_portal_initable_init (GInitable *initable,
g_free (owner);
ret = g_dbus_proxy_get_cached_property (picker->portal_proxy, "version");
g_variant_get (ret, "u", &version);
g_variant_unref (ret);
if (ret)
{
version = g_variant_get_uint32 (ret);
g_variant_unref (ret);
}
if (version != 2)
{
g_debug ("Screenshot portal version: %u", version);