[Xfce4-commits] <midori:master> Check page icons of search engines first, afterwards icon names

[Christian Dywan]

Updating branch refs/heads/master
         to 96178e60b7804becd3b4f39ccfe5a034a63e2ec5 (commit)
       from d536d90d33aa5c0996ed64fd20d4eaf60892e560 (commit)

commit 96178e60b7804becd3b4f39ccfe5a034a63e2ec5
Author: Dale Whittaker <dayul at users.sf.net>
Date:   Wed Jan 13 06:55:06 2010 +0100

    Check page icons of search engines first, afterwards icon names

 midori/midori-searchaction.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index 98ac92c..6fba4ba 100644
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -413,6 +413,9 @@ midori_search_action_get_icon (KatzeItem*    item,
 {
     const gchar* icon;
 
+    if ((icon = katze_item_get_uri (item)) && (g_strstr_len (icon, 8, "://")))
+        return katze_load_cached_icon (icon, widget);
+
     if ((icon = katze_item_get_icon (item)) && *icon)
     {
         GdkScreen* screen;
@@ -421,15 +424,12 @@ midori_search_action_get_icon (KatzeItem*    item,
         screen = gtk_widget_get_screen (widget);
         icon_theme = gtk_icon_theme_get_for_screen (screen);
         if (gtk_icon_theme_has_icon (icon_theme, icon))
+        {
             *icon_name = icon;
-        else
-            *icon_name = GTK_STOCK_FILE;
-        return NULL;
+            return NULL;
+        }
     }
 
-    if ((icon = katze_item_get_uri (item)) && (g_strstr_len (icon, 8, "://")))
-        return katze_load_cached_icon (icon, widget);
-
     *icon_name = GTK_STOCK_FILE;
     return NULL;
 }