[tracker/writeback: 6/6] Merge branch 'master' into writeback

[Philip Van Hoof <pvanhoof src gnome org>]

commit 60063e59152323a0295d014c9b1a7e2d30f48e41
Merge: 4b7b576 b99b1df
Author: Philip Van Hoof <philip codeminded be>
Date:   Tue Dec 22 15:45:32 2009 +0100

    Merge branch 'master' into writeback
    
    Conflicts:
    	src/tracker-extract/tracker-xmp.c

 configure.ac                                       |    1 +
 src/libtracker-data/tracker-sparql-query.vala      |   14 ++++++
 src/plugins/evolution/tracker-evolution-plugin.c   |    2 +-
 src/plugins/kmail/tracker-kmail-registrar.c        |    2 +-
 src/tracker-extract/tracker-extract-jpeg.c         |    7 +++-
 src/tracker-extract/tracker-extract-pdf.c          |    7 +++-
 src/tracker-extract/tracker-extract-png.c          |   11 ++++-
 src/tracker-extract/tracker-extract-tiff.c         |   13 ++++-
 src/tracker-extract/tracker-xmp.c                  |   21 ++++++---
 src/tracker-extract/tracker-xmp.h                  |    3 +
 src/tracker-miner-fs/tracker-miner-applications.c  |    2 +-
 src/tracker-miner-fs/tracker-miner-files.c         |    2 +-
 tests/libtracker-data/Makefile.am                  |    1 +
 tests/libtracker-data/functions/Makefile.am        |   13 ++++++
 tests/libtracker-data/functions/data-1.ontology    |   39 +++++++++++++++++
 tests/libtracker-data/functions/data-1.ttl         |   46 ++++++++++++++++++++
 .../functions/functions-property-1.out             |    7 +++
 .../functions/functions-property-1.rq              |    8 +++
 .../functions/functions-tracker-1.out              |    7 +++
 .../functions/functions-tracker-1.rq               |   10 ++++
 .../functions/functions-xpath-1.out                |    4 ++
 .../libtracker-data/functions/functions-xpath-1.rq |    7 +++
 .../functions/functions-xpath-2.out                |    1 +
 .../libtracker-data/functions/functions-xpath-2.rq |    7 +++
 tests/libtracker-data/tracker-sparql-test.c        |    5 ++
 25 files changed, 222 insertions(+), 18 deletions(-)
---
diff --cc src/tracker-extract/tracker-xmp.c
index 278fe03,fea2859..d25963d
--- a/src/tracker-extract/tracker-xmp.c
+++ b/src/tracker-extract/tracker-xmp.c
@@@ -373,12 -373,7 +373,12 @@@ tracker_xmp_iter_simple (const gcha
  			data->license = g_strdup (value);
  		}
  	} else
 +
 +	/* TODO: A lot of these location fields are pretty vague and ambigious.
 +	 * We should go through them one by one and ensure that all of them are
 +	 * used sanely */
 +
- 	/* Photoshop */
+ 	/* Photoshop TODO: is this needed anyway? */
  	if (g_ascii_strcasecmp (schema,  NS_PHOTOSHOP) == 0) {
  		if (data->City && g_ascii_strcasecmp (name, "City") == 0) {
  			data->City = g_strdup (value);