Merge lp:~kalikiana/midori/appnoctxsearch into lp:midori

[Cris Dywan]

Don't show search menu item if there's no search URL

The gvfs-open error happens when the search URL is NULL. I have no good suggestion atm to fix that, if you have an app mode it may not have your typical preferences. And using GIO to pass a string won't work - the other end may not know what to do if it's not Midori.

So the fix for now only shows the menu item if it can work, ie was set in the app somewhere.

[André Stösel (ivaldi)]

Hm... we should add some fallback search to app mode - stuff like ctrl+l "some search term" dosn't work either (result is about:blank).
However, the bug is fixed ;)

review: Approve

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-08-09 22:00:48 +0000
+++ midori/midori-view.c	2013-08-09 22:57:26 +0000
@@ -2463,8 +2463,9 @@
             }
             g_object_unref (search_engines);
         }
-        midori_context_action_add_simple (menu, "SearchWeb", _("_Search the Web"), NULL, GTK_STOCK_FIND,
-            midori_web_view_menu_search_web_activate_cb, view);
+        if (midori_settings_get_location_entry_search (MIDORI_SETTINGS (view->settings)) != NULL)
+            midori_context_action_add_simple (menu, "SearchWeb", _("_Search the Web"), NULL, GTK_STOCK_FIND,
+                midori_web_view_menu_search_web_activate_cb, view);
     }
     #endif