[Xfce4-commits] <midori:master> Bail out of midori_view_unset_icon if icon_info is NULL

[Christian Dywan]

Updating branch refs/heads/master
         to c434803e18ba976c9979af5a521627bda2f303f1 (commit)
       from 99b5cf6357c45d3060504ecfdb3137d0a29cc194 (commit)

commit c434803e18ba976c9979af5a521627bda2f303f1
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Nov 16 18:57:55 2012 +0100

    Bail out of midori_view_unset_icon if icon_info is NULL
    
    This is true for unit tests running on Launchpad.

 midori/midori-view.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index f1bad67..3c6ca8c 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -464,8 +464,11 @@ midori_view_unset_icon (MidoriView* view)
     g_themed_icon_append_name (G_THEMED_ICON (icon), "text-html");
 
     icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme, icon, 16, 0);
-    pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
     g_object_unref (icon);
+    if (icon_info == NULL)
+        return;
+
+    pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
 
     midori_view_apply_icon (view, pixbuf, "stock://gtk-file");
 }