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

Merge branch 'fix-shell-colorpicker' into 'master'

Browse Source 
colorpickershell: Unpack the tuple returned from PickColor()

See merge request GNOME/gtk!296

(cherry picked from commit d13cd9cb67)

08f32c65 colorpickershell: Unpack the tuple returned from PickColor()
This commit is contained in:
Matthias Clasen
2018-08-17 12:35:46 +00:00
committed by Iain Lane
parent 25d512c186
commit 0e75d72f28
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkcolorpickershell.c
View File

@@ -119,7 +119,7 @@ color_picked (GObject *source,
{
GtkColorPickerShell *picker = GTK_COLOR_PICKER_SHELL (data);
GError *error = NULL;
GVariant *ret;
GVariant *ret, *dict;
ret = g_dbus_proxy_call_finish (picker->shell_proxy, res, &error);
@@ -131,12 +131,15 @@ color_picked (GObject *source,
{
GdkRGBA c;
g_variant_get (ret, "(@a{sv})", &dict);
c.alpha = 1;
if (!g_variant_lookup (ret, "color", "(ddd)", &c.red, &c.green, &c.blue))
if (!g_variant_lookup (dict, "color", "(ddd)", &c.red, &c.green, &c.blue))
g_task_return_new_error (picker->task, G_IO_ERROR, G_IO_ERROR_FAILED, "No color received");
else
g_task_return_pointer (picker->task, gdk_rgba_copy (&c), (GDestroyNotify)gdk_rgba_free);
g_variant_unref (dict);
g_variant_unref (ret);
}