This is an automated email from the git hooks/post-receive script. o c h o s i p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository xfce/xfce4-panel.
commit a4adbb4dd9ef259e5dce0a7307ae594a065aae08 Author: Ali Abdallah <a...@xfce.org> Date: Mon Jul 3 12:16:26 2017 +0200 Fix remote_event for both internal and external plugins --- panel/panel-dbus-service.c | 1 + panel/panel-plugin-external-wrapper.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/panel/panel-dbus-service.c b/panel/panel-dbus-service.c index 622cbcb..c176788 100644 --- a/panel/panel-dbus-service.c +++ b/panel/panel-dbus-service.c @@ -305,6 +305,7 @@ panel_dbus_service_plugin_event (XfcePanelExportedService *skeleton, * plugins returns TRUE in this remote-event handler */ factory = panel_module_factory_get (); plugins = panel_module_factory_get_plugins (factory, plugin_name); + variant = g_variant_get_variant (variant); g_dbus_gvariant_to_gvalue (variant, &value); diff --git a/panel/panel-plugin-external-wrapper.c b/panel/panel-plugin-external-wrapper.c index 0ba9292..dff85ce 100644 --- a/panel/panel-plugin-external-wrapper.c +++ b/panel/panel-plugin-external-wrapper.c @@ -354,11 +354,11 @@ panel_plugin_external_wrapper_remote_event (PanelPluginExternal *external, if (value == NULL) variant = g_variant_new_variant (g_variant_new_byte ('\0')); - else if (G_VALUE_TYPE(value) == G_TYPE_VARIANT) - variant = g_variant_get_variant(g_value_get_variant (value)); else + variant = panel_plugin_external_wrapper_gvalue_prop_to_gvariant (value); + if (variant == NULL) { - g_warning ("Unexpected value of type: %s", G_VALUE_TYPE_NAME(value)); + g_warning ("Failed to convert value from gvalue:%s to gvariant", G_VALUE_TYPE_NAME(value)); variant = g_variant_new_variant (g_variant_new_byte ('\0')); } -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits