[devhelp: 22/22] Merge branch 'gb619202-book-manager'

[Frederic Peters <fpeters src gnome org>]

commit a9b25d74b596886307c7a724a71d36d0c68be8e2
Merge: 110cf4f b3068da
Author: Frédéric Péters <fpeters 0d be>
Date:   Mon Jul 12 11:05:02 2010 +0200

    Merge branch 'gb619202-book-manager'

 .gitignore              |    1 +
 AUTHORS                 |    9 +-
 data/devhelp.schemas.in |   12 ++
 data/ui/devhelp.builder |  408 +++++++++++++++++++++++++----------------------
 src/Makefile.am         |    4 +
 src/dh-assistant-view.c |   56 ++++---
 src/dh-base.c           |  342 +++-------------------------------------
 src/dh-base.h           |   21 ++--
 src/dh-book-manager.c   |  408 +++++++++++++++++++++++++++++++++++++++++++++++
 src/dh-book-manager.h   |   61 +++++++
 src/dh-book-tree.c      |   46 ++++--
 src/dh-book-tree.h      |    9 +-
 src/dh-book.c           |  246 ++++++++++++++++++++++++++++
 src/dh-book.h           |   67 ++++++++
 src/dh-keyword-model.c  |  129 +++++++++------
 src/dh-keyword-model.h  |    3 +-
 src/dh-marshal.list     |    1 +
 src/dh-parser.c         |   16 +--
 src/dh-parser.h         |    2 +-
 src/dh-preferences.c    |  209 +++++++++++++++++-------
 src/dh-preferences.h    |    2 +-
 src/dh-search.c         |  139 +++++++++++------
 src/dh-search.h         |    9 +-
 src/dh-util.c           |   39 ++++-
 src/dh-util.h           |    2 +
 src/dh-window.c         |   67 +++++---
 26 files changed, 1526 insertions(+), 782 deletions(-)
---
diff --cc src/dh-base.c
index b89132c,4dc8415..bc1c954
--- a/src/dh-base.c
+++ b/src/dh-base.c
@@@ -120,11 -100,10 +102,10 @@@ dh_base_init (DhBase *base
          ige_conf_add_defaults (conf, path);
          g_free (path);
  
-         priv->book_tree = g_node_new (NULL);
-         priv->books = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                              g_free, g_free);
+         priv->book_manager = dh_book_manager_new ();
+         dh_book_manager_populate (priv->book_manager);
  
 -#ifdef GDK_WINDOWING_X11
 +#ifdef HAVE_WNCK
          {
                  gint n_screens, i;