[tracker/urho-sync: 12/12] Merge branch 'master' into urho-sync

[Philip Van Hoof <pvanhoof src gnome org>]

commit a7a73398baa8d87ecdb32b0228ffb78c5818a36e
Merge: 2c25a57... d8aebcb...
Author: Philip Van Hoof <philip codeminded be>
Date:   Wed Aug 19 15:39:40 2009 +0200

    Merge branch 'master' into urho-sync
    
    Conflicts:
    	src/tracker-store/tracker-main.c

 configure.ac                                       |    6 +-
 data/ontologies/36-scal.ontology                   |   10 +-
 src/libtracker-common/.gitignore                   |    1 +
 src/libtracker-common/Makefile.am                  |    5 +-
 src/libtracker-common/tracker-turtle-writer.vala   |  180 ++++++
 src/libtracker-data/.gitignore                     |    1 +
 src/libtracker-data/Makefile.am                    |    9 +-
 src/libtracker-data/tracker-data-backup.c          |   70 ++-
 src/libtracker-data/tracker-data-backup.h          |   19 +-
 src/libtracker-data/tracker-data-manager.c         |   87 ++--
 src/libtracker-data/tracker-sparql-query.vala      |  146 +++--
 src/libtracker-data/tracker-sparql-scanner.vala    |   62 ++-
 src/libtracker-data/tracker-turtle-reader.vala     |  374 +++++++++++
 src/libtracker-data/tracker-turtle.c               |  664 --------------------
 src/libtracker-data/tracker-turtle.h               |   71 ---
 src/plugins/evolution/Makefile.am                  |    1 -
 src/plugins/kmail/Makefile.am                      |    1 -
 src/tracker-miner-fs/tracker-indexer.c             |    1 -
 src/tracker-miner-fs/tracker-main.c                |    4 -
 src/tracker-miner-fs/tracker-removable-device.c    |   19 +-
 src/tracker-miner-fs/tracker-removable-device.h    |    2 +
 src/tracker-store/tracker-backup.c                 |   99 +--
 src/tracker-store/tracker-main.c                   |    4 -
 src/tracker-store/tracker-store.c                  |   39 +-
 tests/libtracker-data/Makefile.am                  |    6 +-
 tests/libtracker-data/tracker-ontology-test.c      |   20 +-
 tests/libtracker-data/tracker-sparql-test.c        |   26 +-
 tests/libtracker-data/turtle/Makefile.am           |    7 +
 .../turtle/turtle-data-001.ontology                |   20 +
 tests/libtracker-data/turtle/turtle-data-001.ttl   |    5 +
 tests/libtracker-data/turtle/turtle-query-001.out  |    1 +
 tests/libtracker-data/turtle/turtle-query-001.rq   |    7 +
 utils/services/Makefile.am                         |   12 +-
 utils/services/data-validator.c                    |  120 ++---
 utils/services/ontology-validator.c                |   73 +--
 utils/services/ttl2html.c                          |    2 -
 utils/services/ttl_loader.c                        |  152 ++----
 37 files changed, 1048 insertions(+), 1278 deletions(-)
---
diff --cc src/tracker-store/tracker-main.c
index 1683588,5421b06..fff0628
--- a/src/tracker-store/tracker-main.c
+++ b/src/tracker-store/tracker-main.c
@@@ -747,8 -746,8 +746,6 @@@ main (gint argc, gchar *argv[]
  			  NULL);
  #endif /* HAVE_HAL */
  
- 	tracker_turtle_init ();
- 
 -	tracker_store_init ();
 -
  	flags |= TRACKER_DB_MANAGER_REMOVE_CACHE;
  
  	if (force_reindex) {