[tracker/direct-access: 67/90] libtracker-data: Fixed documentation build errors and some warnings
- From: Jürg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/direct-access: 67/90] libtracker-data: Fixed documentation build errors and some warnings
- Date: Fri, 6 Aug 2010 11:23:47 +0000 (UTC)
commit 3fd79eb7e825b753d5bd4aaec63c14a928e92b65
Author: Martyn Russell <martyn lanedo com>
Date: Thu Jul 22 11:11:22 2010 +0100
libtracker-data: Fixed documentation build errors and some warnings
docs/tools/Makefile.am | 2 +-
docs/tools/ontology-graph.c | 1 -
src/libtracker-data/tracker-data.h | 1 +
src/miners/fs/Makefile.am | 3 +-
src/miners/fs/tracker-miner-files.c | 45 +++++++++++++++++++---------------
src/tracker-control/Makefile.am | 2 +
6 files changed, 31 insertions(+), 23 deletions(-)
---
diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index 9a515f3..59d6703 100644
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = \
-DTOP_SRCDIR=\"$(top_srcdir)\" \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
- -I$(top_builddir)/src/libtracker-client \
+ -I$(top_builddir)/src/libtracker-sparql \
-I$(top_builddir)/src/libtracker-data \
$(WARN_CFLAGS) \
$(GLIB2_CFLAGS) \
diff --git a/docs/tools/ontology-graph.c b/docs/tools/ontology-graph.c
index 78b6a9c..42f1830 100644
--- a/docs/tools/ontology-graph.c
+++ b/docs/tools/ontology-graph.c
@@ -21,7 +21,6 @@
#include <gio/gio.h>
#include <glib/gprintf.h>
#include <libtracker-data/tracker-data.h>
-#include <libtracker-data/tracker-sparql-query.h>
#define RDF_PREFIX TRACKER_RDF_PREFIX
#define RDF_PROPERTY RDF_PREFIX "Property"
diff --git a/src/libtracker-data/tracker-data.h b/src/libtracker-data/tracker-data.h
index 464aefd..84e2f8e 100644
--- a/src/libtracker-data/tracker-data.h
+++ b/src/libtracker-data/tracker-data.h
@@ -41,6 +41,7 @@
#include "tracker-ontology.h"
#include "tracker-ontologies.h"
#include "tracker-property.h"
+#include "tracker-sparql-query.h"
#undef __LIBTRACKER_DATA_INSIDE__
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index fe9a705..5611901 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -13,6 +13,8 @@ INCLUDES = \
-I$(top_builddir)/src/libtracker-client \
-I$(top_srcdir)/src/libtracker-data \
-I$(top_builddir)/src/libtracker-data \
+ -I$(top_srcdir)/src/libtracker-sparql \
+ -I$(top_builddir)/src/libtracker-sparql \
$(WARN_CFLAGS) \
$(GMODULE_CFLAGS) \
$(GIO_CFLAGS) \
@@ -35,7 +37,6 @@ tracker_miner_fs_SOURCES = \
tracker-miner-files-reindex.h
tracker_miner_fs_LDADD = \
- $(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-data/libtracker-data.la \
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index 3281f29..68184c0 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -802,10 +802,11 @@ set_up_mount_point (TrackerMinerFiles *miner,
g_string_append_printf (accumulator, "%s ", queries->str);
} else {
tracker_sparql_connection_update_async (tracker_miner_get_connection (TRACKER_MINER (miner)),
- queries->str,
- NULL, NULL,
- set_up_mount_point_cb,
- g_strdup (removable_device_urn));
+ queries->str,
+ G_PRIORITY_DEFAULT,
+ NULL,
+ set_up_mount_point_cb,
+ g_strdup (removable_device_urn));
}
g_string_free (queries, TRUE);
@@ -993,10 +994,11 @@ init_mount_points (TrackerMinerFiles *miner_files)
if (accumulator->str[0] != '\0') {
tracker_sparql_connection_update_async (tracker_miner_get_connection (miner),
- accumulator->str,
- NULL, NULL,
- init_mount_points_cb,
- miner);
+ accumulator->str,
+ G_PRIORITY_DEFAULT,
+ NULL,
+ init_mount_points_cb,
+ miner);
} else {
/* If no further mount point initialization was needed,
* initialize stale volume removal here. */
@@ -1157,10 +1159,11 @@ mount_point_added_cb (TrackerStorage *storage,
set_up_mount_point (miner, urn, mount_point, TRUE, queries);
set_up_mount_point_type (miner, urn, removable, optical, queries);
tracker_sparql_connection_update_async (tracker_miner_get_connection (TRACKER_MINER (miner)),
- queries->str,
- NULL, NULL,
- set_up_mount_point_cb,
- g_strdup (urn));
+ queries->str,
+ G_PRIORITY_DEFAULT,
+ NULL,
+ set_up_mount_point_cb,
+ g_strdup (urn));
g_string_free (queries, TRUE);
g_free (urn);
}
@@ -2616,10 +2619,11 @@ miner_files_in_removable_media_remove_by_type (TrackerMinerFiles *miner,
optical ? "true" : "false");
tracker_sparql_connection_update_async (tracker_miner_get_connection (TRACKER_MINER (miner)),
- queries->str,
- NULL, NULL,
- remove_files_in_removable_media_cb,
- NULL);
+ queries->str,
+ G_PRIORITY_DEFAULT,
+ NULL,
+ remove_files_in_removable_media_cb,
+ NULL);
g_string_free (queries, TRUE);
@@ -2657,10 +2661,11 @@ miner_files_in_removable_media_remove_by_date (TrackerMinerFiles *miner,
date);
tracker_sparql_connection_update_async (tracker_miner_get_connection (TRACKER_MINER (miner)),
- queries->str,
- NULL, NULL,
- remove_files_in_removable_media_cb,
- NULL);
+ queries->str,
+ G_PRIORITY_DEFAULT,
+ NULL,
+ remove_files_in_removable_media_cb,
+ NULL);
g_string_free (queries, TRUE);
}
diff --git a/src/tracker-control/Makefile.am b/src/tracker-control/Makefile.am
index 8aac119..ae86ed7 100644
--- a/src/tracker-control/Makefile.am
+++ b/src/tracker-control/Makefile.am
@@ -9,6 +9,8 @@ INCLUDES = \
-I$(top_builddir)/src/libtracker-client \
-I$(top_srcdir)/src/libtracker-data \
-I$(top_builddir)/src/libtracker-data \
+ -I$(top_srcdir)/src/libtracker-sparql \
+ -I$(top_builddir)/src/libtracker-sparql \
$(WARN_CFLAGS) \
$(GCOV_CFLAGS) \
$(DBUS_CFLAGS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
