[devhelp/wip/book-manager-singleton] KeywordModel: remove dh_keyword_model_set_words()

[Sébastien Wilmet <swilmet src gnome org>]

commit 15e904a7415238bbc191bd7ad417ec609b94342b
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Mon May 1 16:37:03 2017 +0200

    KeywordModel: remove dh_keyword_model_set_words()
    
    It was part of the API, but neither Anjuta nor gnome-builder use that
    function, so I think it is not a big problem to directly remove it.

 docs/reference/devhelp-sections.txt |    1 -
 src/dh-keyword-model.c              |   41 ++--------------------------------
 src/dh-keyword-model.h              |    2 -
 src/dh-sidebar.c                    |    2 -
 4 files changed, 3 insertions(+), 43 deletions(-)
---
diff --git a/docs/reference/devhelp-sections.txt b/docs/reference/devhelp-sections.txt
index f1c9de9..f4964f8 100644
--- a/docs/reference/devhelp-sections.txt
+++ b/docs/reference/devhelp-sections.txt
@@ -134,7 +134,6 @@ dh_book_tree_get_type
 <TITLE>DhKeywordModel</TITLE>
 DhKeywordModel
 dh_keyword_model_new
-dh_keyword_model_set_words
 dh_keyword_model_filter
 <SUBSECTION Standard>
 DhKeywordModelClass
diff --git a/src/dh-keyword-model.c b/src/dh-keyword-model.c
index 58ea51c..3ffe1eb 100644
--- a/src/dh-keyword-model.c
+++ b/src/dh-keyword-model.c
@@ -30,8 +30,6 @@
 #include "dh-util.h"
 
 typedef struct {
-        DhBookManager *book_manager;
-
         gchar *current_book_id;
 
         /* List of DhLink* */
@@ -74,16 +72,6 @@ G_DEFINE_TYPE_WITH_CODE (DhKeywordModel, dh_keyword_model, G_TYPE_OBJECT,
                                                 dh_keyword_model_tree_model_init));
 
 static void
-dh_keyword_model_dispose (GObject *object)
-{
-        DhKeywordModelPrivate *priv = dh_keyword_model_get_instance_private (DH_KEYWORD_MODEL (object));
-
-        g_clear_object (&priv->book_manager);
-
-        G_OBJECT_CLASS (dh_keyword_model_parent_class)->dispose (object);
-}
-
-static void
 dh_keyword_model_finalize (GObject *object)
 {
         DhKeywordModelPrivate *priv = dh_keyword_model_get_instance_private (DH_KEYWORD_MODEL (object));
@@ -99,7 +87,6 @@ dh_keyword_model_class_init (DhKeywordModelClass *klass)
 {
         GObjectClass *object_class = G_OBJECT_CLASS (klass);;
 
-        object_class->dispose = dh_keyword_model_dispose;
         object_class->finalize = dh_keyword_model_finalize;
 }
 
@@ -366,27 +353,6 @@ dh_keyword_model_new (void)
         return g_object_new (DH_TYPE_KEYWORD_MODEL, NULL);
 }
 
-/**
- * dh_keyword_model_set_words:
- * @model: a #DhKeywordModel.
- * @book_manager: a #DhBookManager.
- *
- * Sets the #DhBookManager in which symbols are searched.
- */
-void
-dh_keyword_model_set_words (DhKeywordModel *model,
-                            DhBookManager  *book_manager)
-{
-        DhKeywordModelPrivate *priv;
-
-        g_return_if_fail (DH_IS_KEYWORD_MODEL (model));
-        g_return_if_fail (DH_IS_BOOK_MANAGER (book_manager));
-
-        priv = dh_keyword_model_get_instance_private (model);
-
-        priv->book_manager = g_object_ref (book_manager);
-}
-
 /* For each keyword, creates a DhKeywordGlobPattern with GPatternSpec's
  * allocated if there are any special glob characters ('*', '?') in the keyword.
  */
@@ -596,15 +562,14 @@ keyword_model_search_books (DhKeywordModel  *model,
                             guint            max_hits,
                             DhLink         **exact_link)
 {
-        DhKeywordModelPrivate *priv;
+        DhBookManager *book_manager;
         GQueue *ret;
         GList *l;
 
-        priv = dh_keyword_model_get_instance_private (model);
-
+        book_manager = dh_book_manager_get_singleton ();
         ret = g_queue_new ();
 
-        for (l = dh_book_manager_get_books (priv->book_manager);
+        for (l = dh_book_manager_get_books (book_manager);
              l != NULL && ret->length < max_hits;
              l = l->next) {
                 DhBook *book;
diff --git a/src/dh-keyword-model.h b/src/dh-keyword-model.h
index 9edefcb..efde63b 100644
--- a/src/dh-keyword-model.h
+++ b/src/dh-keyword-model.h
@@ -55,8 +55,6 @@ enum {
 
 GType           dh_keyword_model_get_type  (void);
 DhKeywordModel *dh_keyword_model_new       (void);
-void            dh_keyword_model_set_words (DhKeywordModel *model,
-                                            DhBookManager  *book_manager);
 DhLink *        dh_keyword_model_filter    (DhKeywordModel *model,
                                             const gchar    *search_string,
                                             const gchar    *book_id,
diff --git a/src/dh-sidebar.c b/src/dh-sidebar.c
index 79399a3..6f9de91 100644
--- a/src/dh-sidebar.c
+++ b/src/dh-sidebar.c
@@ -670,8 +670,6 @@ dh_sidebar_constructed (GObject *object)
 
         sidebar_completion_populate (sidebar);
 
-        dh_keyword_model_set_words (priv->hitlist_model, priv->book_manager);
-
         G_OBJECT_CLASS (dh_sidebar_parent_class)->constructed (object);
 }