luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-15 04:05:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes GB#635187: Always unbox GVariant parameter received via dbus for an action

Browse Source
This commit is contained in:
Aleksander Morgado 2010-11-18 18:00:57 +01:00 committed by Matthias Clasen
parent fcd3e34227
commit 98bfc8afda
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gapplicationimpl-dbus.c
View File

@ -354,17 +354,21 @@ g_application_impl_actions_method_call (GDBusConnection *connection,
GVariant *platform_data; GVariant *platform_data;
GVariantIter *param; GVariantIter *param;
GVariant *parameter; GVariant *parameter;
GVariant *unboxed_parameter;
g_variant_get (parameters, "(&sav@a{sv})", g_variant_get (parameters, "(&sav@a{sv})",
&action_name, &param, &platform_data); &action_name, &param, &platform_data);
parameter = g_variant_iter_next_value (param); parameter = g_variant_iter_next_value (param);
unboxed_parameter = parameter ? g_variant_get_variant (parameter) : NULL;
g_variant_iter_free (param); g_variant_iter_free (param);
class->before_emit (impl->app, platform_data); class->before_emit (impl->app, platform_data);
g_action_group_activate_action (action_group, action_name, parameter); g_action_group_activate_action (action_group, action_name, unboxed_parameter);
class->after_emit (impl->app, platform_data); class->after_emit (impl->app, platform_data);
g_variant_unref (platform_data); g_variant_unref (platform_data);
if (unboxed_parameter)
g_variant_unref (unboxed_parameter);
if (parameter) if (parameter)
g_variant_unref (parameter); g_variant_unref (parameter);