[gtk/wip/hadess/portal-fixes: 2/5] colorpickerportal: Simplify portal version fetching
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/hadess/portal-fixes: 2/5] colorpickerportal: Simplify portal version fetching
- Date: Mon, 30 Mar 2020 12:19:52 +0000 (UTC)
commit 76fba81a2dc6531078f28647b88481ea5620de19
Author: Bastien Nocera <hadess hadess net>
Date: Mon Mar 23 14:46:49 2020 +0100
colorpickerportal: Simplify portal version fetching
gtk/gtkcolorpickerportal.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkcolorpickerportal.c b/gtk/gtkcolorpickerportal.c
index 76eacd469b..85e5f7c04e 100644
--- a/gtk/gtkcolorpickerportal.c
+++ b/gtk/gtkcolorpickerportal.c
@@ -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 (!gdk_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 ("%s not provided", PORTAL_SCREENSHOT_INTERFACE);
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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]