[tracker/tracker-0.6] Fixed documentation build failures related to changes on TrackerDataMetadata

[Martyn James Russell <mr src gnome org>]

commit 8035aadaa7e184d57b1bbf393a23221b81d0d937
Author: Martyn Russell <martyn imendio com>
Date:   Wed Jun 24 16:03:30 2009 +0100

    Fixed documentation build failures related to changes on TrackerDataMetadata

 src/tracker-indexer/Makefile.am                    |    4 +++-
 src/tracker-indexer/tracker-module-file.c          |    3 +++
 src/tracker-indexer/tracker-module-metadata.h      |    1 -
 tests/libtracker-data/tracker-data-metadata-test.c |    8 ++++----
 tests/libtracker-data/tracker-turtle-test.c        |    8 ++++++--
 5 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/src/tracker-indexer/Makefile.am b/src/tracker-indexer/Makefile.am
index e419744..cf9e5e6 100644
--- a/src/tracker-indexer/Makefile.am
+++ b/src/tracker-indexer/Makefile.am
@@ -38,7 +38,9 @@ libtracker_moduleinclude_HEADERS =					\
 	tracker-module-metadata-utils.h					\
 	tracker-module-metadata.h
 
-libtracker_module_la_LIBADD = $(GCOV_LIBS)
+libtracker_module_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
+	$(GCOV_LIBS)
 
 libexec_PROGRAMS = tracker-indexer
 
diff --git a/src/tracker-indexer/tracker-module-file.c b/src/tracker-indexer/tracker-module-file.c
index 3704afa..641c2a3 100644
--- a/src/tracker-indexer/tracker-module-file.c
+++ b/src/tracker-indexer/tracker-module-file.c
@@ -18,6 +18,9 @@
  */
 
 #include <libtracker-common/tracker-file-utils.h>
+
+#include <libtracker-data/tracker-data-metadata.h>
+
 #include "tracker-module-metadata-private.h"
 #include "tracker-module-file.h"
 
diff --git a/src/tracker-indexer/tracker-module-metadata.h b/src/tracker-indexer/tracker-module-metadata.h
index 9a93536..831ddef 100644
--- a/src/tracker-indexer/tracker-module-metadata.h
+++ b/src/tracker-indexer/tracker-module-metadata.h
@@ -24,7 +24,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include "libtracker-data/tracker-data-metadata.h"
 
 G_BEGIN_DECLS
 
diff --git a/tests/libtracker-data/tracker-data-metadata-test.c b/tests/libtracker-data/tracker-data-metadata-test.c
index 95d3fe6..142e911 100644
--- a/tests/libtracker-data/tracker-data-metadata-test.c
+++ b/tests/libtracker-data/tracker-data-metadata-test.c
@@ -65,10 +65,10 @@ test_new_free ()
 
         metadata = tracker_data_metadata_new ();
         g_assert (metadata != NULL);
-        tracker_data_metadata_free (metadata);
+	g_object_unref (metadata);
         
         if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
-                tracker_data_metadata_free (NULL);
+		g_object_unref (NULL);
         }
         g_test_trap_assert_failed ();
 }
@@ -100,7 +100,7 @@ test_single_valued ()
         g_assert (result);
         g_assert (g_strcmp0 (result, "13") == 0);
 
-        tracker_data_metadata_free (metadata);
+	g_object_unref (metadata);
 }
 
 static void
@@ -141,7 +141,7 @@ test_multiple_valued ()
         g_list_free (tags);
         tags = NULL;
 
-        tracker_data_metadata_free (metadata);
+	g_object_unref (metadata);
 }
 
 static void
diff --git a/tests/libtracker-data/tracker-turtle-test.c b/tests/libtracker-data/tracker-turtle-test.c
index 2b60456..55916d7 100644
--- a/tests/libtracker-data/tracker-turtle-test.c
+++ b/tests/libtracker-data/tracker-turtle-test.c
@@ -23,8 +23,12 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
-#include <libtracker-data/tracker-turtle.h>
+
 #include <libtracker-common/tracker-common.h>
+
+#include <libtracker-data/tracker-turtle.h>
+#include <libtracker-data/tracker-data-metadata.h>
+
 #include <tracker-test-helpers.h>
 
 #define TEST_FILE "./test-file.ttl"
@@ -337,7 +341,7 @@ test_add_metadatas (void)
 	clean_test_file ();
 	
 	g_free (item->about_uri);
-	tracker_data_metadata_free (item->metadata);
+	g_object_unref (item->metadata);
 
 	tracker_turtle_shutdown ();
 }