gtk2/gtk/gtkcolorpickershell.c
Iain Lane dce33fa830 colorpickershell: Unpack the tuple returned from PickColor()
When calling PickColor on org.gnome.Shell, we get back an "a{sv}", which
GDBus provides to us as "(a{sv})".

At the minute we're not unpacking this tuple, and so picking fails with
messages like:

  GLib-CRITICAL **: 13:38:19.439: g_variant_lookup_value: assertion 'g_variant_is_of_type (dictionary, G_VARIANT_TYPE ("a{s*}")) || g_variant_is_of_type (dictionary, G_VARIANT_TYPE ("a{o*}"))' failed

  Gtk-WARNING **: 13:38:19.439: Picking color failed: No color received

Let's unpack it.
2018-08-17 09:10:59 -04:00

187 lines
5.5 KiB
C

/* GTK - The GIMP Toolkit
* Copyright (C) 2018, Red Hat, Inc
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "gtkcolorpickershellprivate.h"
#include <gio/gio.h>
struct _GtkColorPickerShell
{
GObject parent_instance;
GDBusProxy *shell_proxy;
GTask *task;
};
struct _GtkColorPickerShellClass
{
GObjectClass parent_class;
};
static GInitableIface *initable_parent_iface;
static void gtk_color_picker_shell_initable_iface_init (GInitableIface *iface);
static void gtk_color_picker_shell_iface_init (GtkColorPickerInterface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkColorPickerShell, gtk_color_picker_shell, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gtk_color_picker_shell_initable_iface_init)
G_IMPLEMENT_INTERFACE (GTK_TYPE_COLOR_PICKER, gtk_color_picker_shell_iface_init))
static gboolean
gtk_color_picker_shell_initable_init (GInitable *initable,
GCancellable *cancellable,
GError **error)
{
GtkColorPickerShell *picker = GTK_COLOR_PICKER_SHELL (initable);
char *owner;
picker->shell_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_NONE,
NULL,
"org.gnome.Shell.Screenshot",
"/org/gnome/Shell/Screenshot",
"org.gnome.Shell.Screenshot",
NULL,
error);
if (picker->shell_proxy == NULL)
{
g_debug ("Failed to create shell screenshot proxy");
return FALSE;
}
owner = g_dbus_proxy_get_name_owner (picker->shell_proxy);
if (owner == NULL)
{
g_debug ("org.gnome.Shell.Screenshot not provided");
g_clear_object (&picker->shell_proxy);
return FALSE;
}
g_free (owner);
return TRUE;
}
static void
gtk_color_picker_shell_initable_iface_init (GInitableIface *iface)
{
initable_parent_iface = g_type_interface_peek_parent (iface);
iface->init = gtk_color_picker_shell_initable_init;
}
static void
gtk_color_picker_shell_init (GtkColorPickerShell *picker)
{
}
static void
gtk_color_picker_shell_finalize (GObject *object)
{
GtkColorPickerShell *picker = GTK_COLOR_PICKER_SHELL (object);
g_clear_object (&picker->shell_proxy);
G_OBJECT_CLASS (gtk_color_picker_shell_parent_class)->finalize (object);
}
static void
gtk_color_picker_shell_class_init (GtkColorPickerShellClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
object_class->finalize = gtk_color_picker_shell_finalize;
}
GtkColorPicker *
gtk_color_picker_shell_new (void)
{
return GTK_COLOR_PICKER (g_initable_new (GTK_TYPE_COLOR_PICKER_SHELL, NULL, NULL, NULL));
}
static void
color_picked (GObject *source,
GAsyncResult *res,
gpointer data)
{
GtkColorPickerShell *picker = GTK_COLOR_PICKER_SHELL (data);
GError *error = NULL;
GVariant *ret, *dict;
ret = g_dbus_proxy_call_finish (picker->shell_proxy, res, &error);
if (ret == NULL)
{
g_task_return_error (picker->task, error);
}
else
{
GdkRGBA c;
g_variant_get (ret, "(@a{sv})", &dict);
c.alpha = 1;
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);
}
g_clear_object (&picker->task);
}
static void
gtk_color_picker_shell_pick (GtkColorPicker *cp,
GAsyncReadyCallback callback,
gpointer user_data)
{
GtkColorPickerShell *picker = GTK_COLOR_PICKER_SHELL (cp);
if (picker->task)
return;
picker->task = g_task_new (picker, NULL, callback, user_data);
g_dbus_proxy_call (picker->shell_proxy,
"PickColor",
NULL,
0,
-1,
NULL,
color_picked,
picker);
}
static GdkRGBA *
gtk_color_picker_shell_pick_finish (GtkColorPicker *cp,
GAsyncResult *res,
GError **error)
{
g_return_val_if_fail (g_task_is_valid (res, cp), NULL);
return g_task_propagate_pointer (G_TASK (res), error);
}
static void
gtk_color_picker_shell_iface_init (GtkColorPickerInterface *iface)
{
iface->pick = gtk_color_picker_shell_pick;
iface->pick_finish = gtk_color_picker_shell_pick_finish;
}