aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2014-04-02 14:50:38 +0000
committerCI bot <ps-jenkins@lists.canonical.com>2014-04-02 14:50:38 +0000
commite662c874244881002e9b38e69a5a7457a603200f (patch)
tree4f3f88b347d80891fae39d0cc4a9f137c93add2d
parent1dc288c344417b837acddf65a47f4d95ef6e3225 (diff)
parent68a5ec6f0657d431df06ea40cc660a9bd2aa18a1 (diff)
downloadlibayatana-indicator-e662c874244881002e9b38e69a5a7457a603200f.tar.gz
libayatana-indicator-e662c874244881002e9b38e69a5a7457a603200f.tar.bz2
libayatana-indicator-e662c874244881002e9b38e69a5a7457a603200f.zip
Don't load using the icon info structure if it's a GBytesIcon. Fixes: 1293548
-rw-r--r--libindicator/indicator-image-helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c
index dd32cb2..27c332f 100644
--- a/libindicator/indicator-image-helper.c
+++ b/libindicator/indicator-image-helper.c
@@ -69,7 +69,7 @@ refresh_image (GtkImage * image)
return;
}
- if (icon_info != NULL) {
+ if (icon_info != NULL && !G_IS_BYTES_ICON(icon_names)) {
GdkPixbuf *pixbuf = gtk_icon_info_load_icon(icon_info, NULL);
if (gdk_pixbuf_get_height(pixbuf) < ICON_SIZE) {