[tracker/writeback: 29/30] Merge branch 'master' into writeback

[Philip Van Hoof <pvanhoof src gnome org>]

commit 460aeee2121598f3059d50f6890a2323b7c23c99
Merge: 76848a6... 494e6e5...
Author: Philip Van Hoof <philip codeminded be>
Date:   Fri Dec 18 11:35:59 2009 +0100

    Merge branch 'master' into writeback

 .gitignore                                         |    2 +
 INSTALL                                            |   17 +-
 Makefile.am                                        |   20 +
 configure.ac                                       |  120 +++-
 data/ontologies/34-nmo.ontology                    |   25 +
 data/ontologies/38-nmm.ontology                    |    2 +-
 docs/Makefile.am                                   |    2 +-
 docs/reference/Makefile.am                         |    3 +-
 docs/reference/ontology/Makefile.am                |   45 +
 docs/reference/ontology/ontology-docs.sgml         |   71 ++
 docs/reference/ontology/ontology.png               |  Bin 0 -> 1187428 bytes
 docs/reference/ontology/version.xml.in             |    1 +
 docs/tools/Makefile.am                             |   70 ++
 docs/tools/gen-doc.sh                              |   33 +
 .../ontology => docs/tools}/generate-ontology.sh   |    0
 {utils/ontology => docs/tools}/ontology-graph.c    |  225 +++++-
 {utils/services => docs/tools}/qname.c             |    0
 {utils/services => docs/tools}/qname.h             |    0
 utils/services/ttl2html.c => docs/tools/ttl2sgml.c |    4 +-
 {utils/services => docs/tools}/ttl_loader.c        |    0
 {utils/services => docs/tools}/ttl_loader.h        |    0
 {utils/services => docs/tools}/ttl_model.c         |    0
 {utils/services => docs/tools}/ttl_model.h         |    0
 docs/tools/ttl_sgml.c                              |  363 ++++++++
 utils/services/ttl_html.h => docs/tools/ttl_sgml.h |    6 +-
 po/POTFILES.in                                     |   16 +-
 src/libtracker-common/Makefile.am                  |    2 +-
 src/libtracker-data/Makefile.am                    |    2 +-
 src/libtracker-data/tracker-data-update.c          |    7 +
 src/libtracker-data/tracker-sparql-query.vala      |   49 +-
 src/plugins/Makefile.am                            |    3 +
 src/plugins/nautilus/Makefile.am                   |   26 +
 src/plugins/nautilus/tracker-tags-extension.c      |  300 +++++++
 src/plugins/nautilus/tracker-tags-utils.c          |  200 +++++
 src/plugins/nautilus/tracker-tags-utils.h          |   38 +
 src/plugins/nautilus/tracker-tags-view.c           |  885 ++++++++++++++++++++
 src/plugins/nautilus/tracker-tags-view.h           |   52 ++
 src/tracker-preferences/Makefile.am                |    2 +-
 src/tracker-store/tracker-resources.c              |   10 +
 utils/Makefile.am                                  |    5 +-
 utils/ontology/Makefile.am                         |   29 -
 utils/services/gen-doc.sh                          |   54 --
 utils/services/ttl_html.c                          |  312 -------
 43 files changed, 2525 insertions(+), 476 deletions(-)
---