debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only set search in the browser if we have any search engines

Browse source 
This fixes the test case which broke when we made settings obligatory.
This commit is contained in:
Christian Dywan 2009-11-21 06:36:35 +01:00
parent f14b711901
commit 3253f1605a
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
midori/midori-browser.c
View file

@ -6446,19 +6446,22 @@ midori_browser_set_property (GObject* object,
_action_by_name (browser, "Search")), browser->search_engines); _action_by_name (browser, "Search")), browser->search_engines);
/* FIXME: Connect to updates */ /* FIXME: Connect to updates */
g_object_get (browser->settings, "last-web-search", &last_web_search, NULL); if (browser->search_engines)
item = katze_array_get_nth_item (browser->search_engines, last_web_search); {
midori_search_action_set_current_item (MIDORI_SEARCH_ACTION ( g_object_get (browser->settings, "last-web-search", &last_web_search, NULL);
_action_by_name (browser, "Search")), item); item = katze_array_get_nth_item (browser->search_engines, last_web_search);
midori_search_action_set_current_item (MIDORI_SEARCH_ACTION (
i = 0;
while ((item = katze_array_get_nth_item (browser->search_engines, i++)))
if (!g_strcmp0 (katze_item_get_uri (item), browser->location_entry_search))
{
midori_search_action_set_default_item (MIDORI_SEARCH_ACTION (
_action_by_name (browser, "Search")), item); _action_by_name (browser, "Search")), item);
break;
} i = 0;
while ((item = katze_array_get_nth_item (browser->search_engines, i++)))
if (!g_strcmp0 (katze_item_get_uri (item), browser->location_entry_search))
{
midori_search_action_set_default_item (MIDORI_SEARCH_ACTION (
_action_by_name (browser, "Search")), item);
break;
}
}
break; break;
} }
case PROP_HISTORY: case PROP_HISTORY: