[Xfce4-commits] [xfce/xfce4-power-manager] 01/01: Fix panel plugin not using symbolic icon anymore

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

ochosi pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit 045712f6e03a1f1a67d62e23a8db8980e20c7659
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Thu Apr 16 11:50:50 2015 +0200

    Fix panel plugin not using symbolic icon anymore
    
    Regression of commit f6ceafb12f43ab7968455cadefdac48383022820
---
 panel-plugins/power-manager-plugin/power-manager-button.c |    9 ++++++++-
 1 file changed, 8 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 1545efc..edc31c6 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -402,11 +402,18 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button,
 
     /* Get the display device, which may now be this one */
     display_device = get_display_device (button);
-    if ( battery_device == display_device)
+    if (battery_device == display_device)
     {
         DBG("this is the display device, updating");
         /* it is! update the panel button */
         g_free (button->priv->panel_icon_name);
+#ifdef XFCE_PLUGIN
+        g_object_get (device,
+                      "icon-name", &icon_name,
+                      NULL);
+        if (icon_name == NULL)
+            icon_name = g_strdup (PANEL_DEFAULT_ICON);
+#endif
         button->priv->panel_icon_name = g_strdup (icon_name);
         power_manager_button_set_icon (button);
         /* update tooltip */

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.