From 5b1b3ef2b070807547f3793512eb1598689c264b Mon Sep 17 00:00:00 2001 From: Peter de Ridder Date: Mon, 19 Jun 2017 21:06:35 +0200 Subject: [PATCH] Moved new property OPACITY to end, make wrapper accept unknown properties --- libxfce4panel/xfce-panel-plugin-provider.h | 4 ++-- panel/panel-plugin-external-46.c | 4 ---- wrapper/main.c | 4 +++- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libxfce4panel/xfce-panel-plugin-provider.h b/libxfce4panel/xfce-panel-plugin-provider.h index d568e8ad..8d173c94 100644 --- a/libxfce4panel/xfce-panel-plugin-provider.h +++ b/libxfce4panel/xfce-panel-plugin-provider.h @@ -107,7 +107,6 @@ typedef enum /*< skip >*/ PROVIDER_PROP_TYPE_SET_NROWS, /* gint */ PROVIDER_PROP_TYPE_SET_LOCKED, /* gboolean */ PROVIDER_PROP_TYPE_SET_SENSITIVE, /* gboolean */ - PROVIDER_PROP_TYPE_SET_OPACITY, /* gdouble */ PROVIDER_PROP_TYPE_SET_BACKGROUND_COLOR, /* string, wrapper only */ PROVIDER_PROP_TYPE_SET_BACKGROUND_IMAGE, /* string, wrapper only */ PROVIDER_PROP_TYPE_ACTION_REMOVED, /* none */ @@ -117,7 +116,8 @@ typedef enum /*< skip >*/ PROVIDER_PROP_TYPE_ACTION_BACKGROUND_UNSET, /* none */ PROVIDER_PROP_TYPE_ACTION_SHOW_CONFIGURE, /* none */ PROVIDER_PROP_TYPE_ACTION_SHOW_ABOUT, /* none */ - PROVIDER_PROP_TYPE_ACTION_ASK_REMOVE /* none */ + PROVIDER_PROP_TYPE_ACTION_ASK_REMOVE, /* none */ + PROVIDER_PROP_TYPE_SET_OPACITY /* gdouble */ } XfcePanelPluginProviderPropType; diff --git a/panel/panel-plugin-external-46.c b/panel/panel-plugin-external-46.c index c115486d..9ccf313b 100644 --- a/panel/panel-plugin-external-46.c +++ b/panel/panel-plugin-external-46.c @@ -290,10 +290,6 @@ panel_plugin_external_46_set_properties (PanelPluginExternal *external, event.xclient.data.s[1] = g_value_get_int (&property->value); break; - case PROVIDER_PROP_TYPE_SET_BACKGROUND_ALPHA: - event.xclient.data.s[1] = g_value_get_double (&property->value) * 100.00; - break; - case PROVIDER_PROP_TYPE_SET_LOCKED: case PROVIDER_PROP_TYPE_SET_SENSITIVE: event.xclient.data.s[1] = g_value_get_boolean (&property->value); diff --git a/wrapper/main.c b/wrapper/main.c index cdf7d687..d46eed78 100644 --- a/wrapper/main.c +++ b/wrapper/main.c @@ -156,7 +156,9 @@ wrapper_gproxy_set (DBusGProxy *dbus_gproxy, break; default: - panel_assert_not_reached (); + g_critical ("Received unknown plugin property %u for %s-%d", + type, xfce_panel_plugin_provider_get_name (provider), + xfce_panel_plugin_provider_get_unique_id (provider)); break; } -- 2.13.0