summaryrefslogtreecommitdiff
path: root/panel
diff options
authorMichael Vogt <michael.vogt@ubuntu.com>2015-12-11 17:34:11 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2015-12-11 17:34:11 +0100
commit3b578768fefb86fbb66b741d4d6dc02d33a5827c (patch)
treeb17f6c3cab55d856d98e440265c74d76a293f328 /panel
parent2a03b25aaa11d34ad90f6f76e3c7df985fa50cd2 (diff)
address review comments (thanks to Trevino!)
(bzr r4036.8.3)
Diffstat (limited to 'panel')
-rw-r--r--panel/PanelIndicatorEntryView.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/panel/PanelIndicatorEntryView.cpp b/panel/PanelIndicatorEntryView.cpp
index 121c69412..083296024 100644
--- a/panel/PanelIndicatorEntryView.cpp
+++ b/panel/PanelIndicatorEntryView.cpp
@@ -40,6 +40,7 @@ namespace
{
DECLARE_LOGGER(logger, "unity.panel.indicator.entry");
const int DEFAULT_SPACING = 3;
+const std::string IMAGE_MISSING = "image-missing";
}
using namespace indicator;
@@ -251,7 +252,7 @@ glib::Object<GdkPixbuf> PanelIndicatorEntryView::MakePixbuf(int size)
// if that failed, whine and load fallback
if (!pixbuf)
{
- LOG_WARN(logger) << "failed to load: " << filename;
+ LOG_WARN(logger) << "failed to load: " << filename;
}
}
else if (image_type == GTK_IMAGE_ICON_NAME)
@@ -265,12 +266,10 @@ glib::Object<GdkPixbuf> PanelIndicatorEntryView::MakePixbuf(int size)
// have a generic fallback pixbuf if for whatever reason icon loading
// failed (see LP: #1525186)
- if(!pixbuf)
+ if (!pixbuf)
{
- const std::string missing = "image-missing";
- GtkIconTheme* theme = gtk_icon_theme_get_default();
- auto flags = GTK_ICON_LOOKUP_FORCE_SIZE;
- pixbuf = gtk_icon_theme_load_icon(theme, missing.c_str(), size, flags, nullptr);
+ GtkIconTheme* theme = gtk_icon_theme_get_default();
+ pixbuf = gtk_icon_theme_load_icon(theme, IMAGE_MISSING.c_str(), size, GTK_ICON_LOOKUP_FORCE_SIZE, nullptr);
}
return pixbuf;