From e78df44bbf75e96e46ec9b8c555621f6452acfcc Mon Sep 17 00:00:00 2001 From: Simon Steinbeiss Date: Thu, 9 Apr 2015 00:15:12 +0200 Subject: [PATCH] Never use symbolic icons for the trayicon --- panel-plugins/power-manager-plugin/power-manager-button.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c index ef9b2ea..9217b9a 100644 --- a/panel-plugins/power-manager-plugin/power-manager-button.c +++ b/panel-plugins/power-manager-plugin/power-manager-button.c @@ -393,7 +393,6 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button, 32, GTK_ICON_LOOKUP_USE_BUILTIN, NULL); - g_free (icon_name); } if (battery_device->details) @@ -412,7 +411,14 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button, DBG("this is the display device, updating"); /* it is! update the panel button */ g_free (button->priv->panel_icon_name); +#ifdef XFCE_PLUGIN button->priv->panel_icon_name = upower_icon; +#else + if (icon_name) + button->priv->panel_icon_name = icon_name; + else + button->priv->panel_icon_name = g_strdup (PANEL_DEFAULT_ICON); +#endif power_manager_button_set_icon (button); /* update tooltip */ power_manager_button_set_tooltip (button); @@ -435,6 +441,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS G_CALLBACK (power_manager_button_device_icon_expose), device); } + + if (icon_name) + g_free (icon_name); } static void -- 2.1.4