[Xfce4-commits] <midori:master> katze_item_get_image check if icon is set

[Christian Dywan]

Updating branch refs/heads/master
         to f586c3004b9277fcd6e0e23b439f232be6fc784b (commit)
       from 599de9cb74930b09aea31d3e3c9c26ef5685ba7b (commit)

commit f586c3004b9277fcd6e0e23b439f232be6fc784b
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Feb 21 21:45:34 2012 +0100

    katze_item_get_image check if icon is set

 katze/katze-item.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/katze/katze-item.c b/katze/katze-item.c
index af708d3..b9ca060 100644
--- a/katze/katze-item.c
+++ b/katze/katze-item.c
@@ -444,7 +444,7 @@ katze_item_get_image (KatzeItem* item)
         image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_MENU);
     else
     {
-        if (!(pixbuf = katze_load_cached_icon (icon, NULL)))
+        if (!(icon && (pixbuf = katze_load_cached_icon (icon, NULL))))
             pixbuf = katze_load_cached_icon (item->uri, NULL);
         if (pixbuf)
         {