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

[Cris Dywan]

Don't add HistoryCompletion if there's no history

[Paweł Forysiuk (tuxator)]

Looks sensible

review: Approve

=== modified file 'midori/midori-locationaction.c'
--- midori/midori-locationaction.c	2013-06-21 20:49:53 +0000
+++ midori/midori-locationaction.c	2013-07-13 17:27:24 +0000
@@ -662,9 +662,11 @@
         midori_autocompleter_add (action->autocompleter,
             MIDORI_COMPLETION (midori_view_completion_new ()));
         midori_autocompleter_add (action->autocompleter,
-            MIDORI_COMPLETION (midori_history_completion_new ()));
-        midori_autocompleter_add (action->autocompleter,
             MIDORI_COMPLETION (midori_search_completion_new ()));
+        /* FIXME: Currently HistoryCompletion doesn't work in memory */
+        if (action->history != NULL)
+            midori_autocompleter_add (action->autocompleter,
+                MIDORI_COMPLETION (midori_history_completion_new ()));
     }
 
     if (!midori_autocompleter_can_complete (action->autocompleter, action->key))