Merge lp:~midori/midori/searchIcons into lp:midori

[Cris Dywan]

Make search icons for engines work correctly

[Paweł Forysiuk (tuxator)]

review: Approve

[RabbitBot (rabbitbot-a)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'midori/midori-searchaction.c'
--- midori/midori-searchaction.c	2015-03-16 15:27:47 +0000
+++ midori/midori-searchaction.c	2015-05-21 20:43:12 +0000
@@ -421,7 +421,7 @@
             menuitem = gtk_image_menu_item_new_with_label (
                 katze_item_get_name (item));
             image = gtk_image_new ();
-            if ((icon = katze_item_get_pixbuf (item, entry)))
+            if ((icon = midori_paths_get_icon (katze_item_get_uri (item), NULL)))
             {
                 gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon);
                 g_object_unref (icon);
@@ -494,37 +494,21 @@
 {
     GdkPixbuf* icon;
 
-    if (search_action->current_item)
+    if (search_action->current_item
+     && (icon = midori_paths_get_icon (katze_item_get_uri (search_action->current_item), NULL)))
     {
-        if ((icon = katze_item_get_pixbuf (search_action->current_item, entry)))
-        {
-            gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, icon);
-            g_object_unref (icon);
-        }
-        else
-        {
-            GdkScreen* screen = gtk_widget_get_screen (entry);
-            GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen);
-            gchar* icon_name;
-            if (gtk_icon_theme_has_icon (icon_theme, "edit-find-option-symbolic"))
-                icon_name = "edit-find-option-symbolic";
-            else if (gtk_icon_theme_has_icon (icon_theme, "edit-find-option"))
-                icon_name = "edit-find-option";
-            else
-                icon_name = STOCK_EDIT_FIND;
-            gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
-                GTK_ENTRY_ICON_PRIMARY, icon_name);
-        }
-        gtk_entry_set_placeholder_text (GTK_ENTRY (entry),
-            katze_item_get_name (search_action->current_item));
+        gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, icon);
+        g_object_unref (icon);
     }
     else
     {
-        gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
-                                            GTK_ENTRY_ICON_PRIMARY,
-                                            GTK_STOCK_FIND);
-        gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "");
+        GIcon* icon = g_themed_icon_new_with_default_fallbacks ("edit-find-option-symbolic");
+        gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry),
+            GTK_ENTRY_ICON_PRIMARY, icon);
     }
+    gtk_entry_set_placeholder_text (GTK_ENTRY (entry),
+        search_action->current_item
+        ? katze_item_get_name (search_action->current_item) : "");
 }
 
 static void
@@ -795,7 +779,7 @@
 
     gtk_tree_model_get (model, iter, 0, &item, -1);
 
-    if ((icon = katze_item_get_pixbuf (item, treeview)))
+    if ((icon = midori_paths_get_icon (katze_item_get_uri (item), NULL)))
     {
         g_object_set (renderer, "pixbuf", icon, "yalign", 0.25, NULL);
         g_object_unref (icon);

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2015-04-28 22:01:05 +0000
+++ midori/midori-view.c	2015-05-21 20:43:12 +0000
@@ -2450,11 +2450,16 @@
                 GtkAction* action = (GtkAction*)midori_context_action_new_escaped (search_option, katze_item_get_name (item), NULL, STOCK_EDIT_FIND);
                 g_free (search_option);
                 midori_context_action_add (searches, action);
-                if ((pixbuf = katze_item_get_pixbuf (item, view->web_view)))
+                if ((pixbuf = midori_paths_get_icon (katze_item_get_uri (item), NULL)))
                 {
-                    gtk_action_set_gicon (GTK_ACTION (action), G_ICON (pixbuf));
+                    gtk_action_set_gicon (action, G_ICON (pixbuf));
                     g_object_unref (pixbuf);
                 }
+                else
+                {
+                    GIcon* icon = g_themed_icon_new_with_default_fallbacks ("edit-find-option-symbolic");
+                    gtk_action_set_gicon (action, icon);
+                }
                 gtk_action_set_always_show_image (GTK_ACTION (action), TRUE);
                 g_object_set_data (G_OBJECT (action), "search", (gchar*)katze_item_get_uri (item));
                 g_signal_connect (action, "activate",