[epiphany] ephy-completion-model: Do not add smart bookmarks to the completion model

[Carlos Garcia Campos <carlosgc src gnome org>]

commit de0b20af8832fe8ebf3c8a70f9b82c6fc76cb4c9
Author: Carlos Garcia Campos <cgarcia igalia com>
Date:   Thu Aug 6 16:00:30 2015 +0200

    ephy-completion-model: Do not add smart bookmarks to the completion model
    
    They are already added by EphyLocationController to the completion menu
    as completion actions. Otherwise they appear twice in the completion
    menu, and with a null address in the first case.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=753321

 src/ephy-completion-model.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/src/ephy-completion-model.c b/src/ephy-completion-model.c
index f2a8854..654c907 100644
--- a/src/ephy-completion-model.c
+++ b/src/ephy-completion-model.c
@@ -44,6 +44,7 @@ struct _EphyCompletionModelPrivate {
   GCancellable *cancellable;
 
   EphyNode *bookmarks;
+  EphyNode *smart_bookmarks;
   GSList *search_terms;
 };
 
@@ -79,9 +80,13 @@ ephy_completion_model_set_property (GObject *object, guint property_id, const GV
   case PROP_HISTORY_SERVICE:
     self->priv->history_service = EPHY_HISTORY_SERVICE (g_value_get_pointer (value));
     break;
-  case PROP_BOOKMARKS:
-    self->priv->bookmarks = ephy_bookmarks_get_bookmarks (EPHY_BOOKMARKS (g_value_get_pointer (value)));
+  case PROP_BOOKMARKS: {
+    EphyBookmarks *bookmarks = EPHY_BOOKMARKS (g_value_get_pointer (value));
+
+    self->priv->bookmarks = ephy_bookmarks_get_bookmarks (bookmarks);
+    self->priv->smart_bookmarks = ephy_bookmarks_get_smart_bookmarks (bookmarks);
     break;
+  }
   default:
     G_OBJECT_WARN_INVALID_PROPERTY_ID (self, property_id, pspec);
     break;
@@ -417,14 +422,17 @@ query_completed_cb (EphyHistoryService *service,
   for (i = 0; i < children->len; i++) {
     EphyNode *kid;
     const char *keywords, *location, *title;
+    gboolean is_smart;
 
     kid = g_ptr_array_index (children, i);
     location = ephy_node_get_property_string (kid, EPHY_NODE_BMK_PROP_LOCATION);
     title = ephy_node_get_property_string (kid, EPHY_NODE_BMK_PROP_TITLE);
     keywords = ephy_node_get_property_string (kid, EPHY_NODE_BMK_PROP_KEYWORDS);
+    is_smart = ephy_node_has_child (priv->smart_bookmarks, kid);
 
-    if (should_add_bookmark_to_model (model, user_data->search_string,
-                                      title, location, keywords))
+    /* Smart bookmarks are already added to the completion menu as completion actions */
+    if (!is_smart && should_add_bookmark_to_model (model, user_data->search_string,
+                                                   title, location, keywords))
       list = add_to_potential_rows (list, title, location, keywords, 0, TRUE, FALSE);
   }