From e86ab4d271e38d51bafbeef9fcbfbba077548952 Mon Sep 17 00:00:00 2001 From: Eric Koegel Date: Sun, 29 Mar 2015 15:38:33 +0300 Subject: [PATCH] Use the default icon if UPower doesn't provide one (Bug #11756) --- .../power-manager-plugin/power-manager-button.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c index ef9b2ea..bc65e9a 100644 --- a/panel-plugins/power-manager-plugin/power-manager-button.c +++ b/panel-plugins/power-manager-plugin/power-manager-button.c @@ -386,16 +386,19 @@ power_manager_button_update_device_icon_and_details (PowerManagerButton *button, icon_name = get_device_icon_name (button->priv->upower, device); details = get_device_description (button->priv->upower, device); - if (icon_name) + if (icon_name == NULL) { - pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), - icon_name, - 32, - GTK_ICON_LOOKUP_USE_BUILTIN, - NULL); - g_free (icon_name); + /* If UPower doesn't give us an icon, just use the default */ + icon_name = g_strdup (PANEL_DEFAULT_ICON); } + pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), + icon_name, + 32, + GTK_ICON_LOOKUP_USE_BUILTIN, + NULL); + g_free (icon_name); + if (battery_device->details) g_free (battery_device->details); battery_device->details = details; -- 2.3.4