From 96178e60b7804becd3b4f39ccfe5a034a63e2ec5 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Wed, 13 Jan 2010 06:55:06 +0100 Subject: [PATCH] Check page icons of search engines first, afterwards icon names --- midori/midori-searchaction.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 98ac92cc..6fba4ba4 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; } -- 2.39.5