[Xfce4-commits] [xfce/xfce4-power-manager] 01/01: Set symbolic fallback icon for plugin and normal one for systray

[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 ffb6b7766252888693c185f05d1ab6756c88240f
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Thu May 28 10:24:08 2015 +0200

    Set symbolic fallback icon for plugin and normal one for systray
---
 panel-plugins/power-manager-plugin/power-manager-button.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index 5350ad8..ea4a795 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -46,6 +46,7 @@
 #define SET_LEVEL_TIMEOUT (50)
 #define SAFE_SLIDER_MIN_LEVEL (5)
 #define PANEL_DEFAULT_ICON ("battery-full-charged")
+#define PANEL_DEFAULT_ICON_SYMBOLIC ("battery-full-charged-symbolic")
 
 #define POWER_MANAGER_BUTTON_GET_PRIVATE(o) \
 (G_TYPE_INSTANCE_GET_PRIVATE ((o), POWER_MANAGER_TYPE_BUTTON, PowerManagerButtonPrivate))
@@ -412,7 +413,7 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button,
                       "icon-name", &icon_name,
                       NULL);
         if (icon_name == NULL || g_strcmp0(icon_name, "") == 0)
-            icon_name = g_strdup (PANEL_DEFAULT_ICON);
+            icon_name = g_strdup (PANEL_DEFAULT_ICON_SYMBOLIC);
 #endif
         button->priv->panel_icon_name = g_strdup (icon_name);
         power_manager_button_set_icon (button);
@@ -825,8 +826,12 @@ power_manager_button_init (PowerManagerButton *button)
         button->priv->channel = xfconf_channel_get ("xfce4-power-manager");
     }
 
-    /* Sane defaults for the panel icon */
+    /* Sane defaults for the systray and panel icon */
+#ifdef XFCE_PLUGIN
+    button->priv->panel_icon_name = g_strdup (PANEL_DEFAULT_ICON_SYMBOLIC);
+#else
     button->priv->panel_icon_name = g_strdup (PANEL_DEFAULT_ICON);
+#endif
     button->priv->panel_icon_width = 24;
 
     /* Sane default Gtk style */

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