[bijiben: 11/11] Merge branch 'collection'

[Pierre-Yves Luyten <pyluyten src gnome org>]

commit df1917568be41785ef3deef2368ff9045e5db564
Merge: abb8f85 1f1a30d
Author: Pierre-Yves Luyten <py luyten fr>
Date:   Mon Apr 29 01:13:21 2013 +0200

    Merge branch 'collection'

 src/bjb-bijiben.c                                 |    6 +-
 src/bjb-controller.c                              |  287 ++++++++++++-------
 src/bjb-controller.h                              |    6 +-
 src/bjb-main-toolbar.c                            |  102 +++++--
 src/bjb-main-view.c                               |   85 ++++---
 src/bjb-main-view.h                               |    8 +-
 src/bjb-note-tag-dialog.c                         |   63 ++--
 src/bjb-selection-toolbar.c                       |    8 +-
 src/bjb-share.c                                   |    2 +-
 src/bjb-window-base.c                             |    6 +
 src/bjb-window-base.h                             |    1 +
 src/libbiji/Makefile.am                           |    4 +
 src/libbiji/biji-collection.c                     |  323 +++++++++++++++++++++
 src/libbiji/biji-collection.h                     |   59 ++++
 src/libbiji/biji-item.c                           |  110 +++++++
 src/libbiji/biji-item.h                           |  112 +++++++
 src/libbiji/biji-note-book.c                      |   96 ++++---
 src/libbiji/biji-note-book.h                      |   18 +-
 src/libbiji/biji-note-obj.c                       |  122 +++++---
 src/libbiji/biji-note-obj.h                       |   26 +--
 src/libbiji/biji-tracker.c                        |   87 +++++-
 src/libbiji/biji-tracker.h                        |    8 +
 src/libbiji/biji-zeitgeist.c                      |    6 +-
 src/libbiji/deserializer/biji-lazy-deserializer.c |    6 +-
 src/libbiji/libbiji.h                             |    2 +
 src/libbiji/serializer/biji-lazy-serializer.c     |    9 +-
 26 files changed, 1217 insertions(+), 345 deletions(-)
---