[tracker/direct-access: 60/122] Rebase fixes
- From: Jürg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/direct-access: 60/122] Rebase fixes
- Date: Fri, 6 Aug 2010 10:19:08 +0000 (UTC)
commit 556c14b83d42f8fca844d511a01cb269a5aca43e
Author: Jürg Billeter <j bitron ch>
Date: Tue Jul 20 14:55:48 2010 +0200
Rebase fixes
src/libtracker-miner/tracker-miner-fs.c | 4 ++--
src/miners/fs/tracker-miner-files.c | 6 ++----
.../libtracker-data/tracker-ontology-change-test.c | 2 --
3 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index abe75b9..ddcf852 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -1310,7 +1310,7 @@ ensure_iri_cache (TrackerMinerFS *fs,
"}",
uri);
- tracker_miner_execute_sparql (TRACKER_MINER (fs),
+ tracker_sparql_connection_query_async (tracker_miner_get_connection (TRACKER_MINER (fs)),
query,
NULL,
cache_query_cb,
@@ -2554,7 +2554,7 @@ ensure_mtime_cache (TrackerMinerFS *fs,
uri);
g_free (uri);
- tracker_miner_execute_sparql (TRACKER_MINER (fs),
+ tracker_sparql_connection_query_async (tracker_miner_get_connection (TRACKER_MINER (fs)),
query,
NULL,
cache_query_cb,
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index 8bc4ded..3281f29 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -853,12 +853,10 @@ init_mount_points (TrackerMinerFiles *miner_files)
/* First, get all mounted volumes, according to tracker-store (SYNC!) */
cursor = tracker_sparql_connection_query (tracker_miner_get_connection (miner),
"SELECT ?v WHERE { ?v a tracker:Volume ; tracker:isMounted true }",
- &error);
+ NULL, &error);
if (error) {
g_critical ("Could not obtain the mounted volumes: %s", error->message);
g_error_free (error);
- if (iterator)
- tracker_result_iterator_free (iterator);
return;
}
@@ -891,7 +889,7 @@ init_mount_points (TrackerMinerFiles *miner_files)
g_hash_table_replace (volumes, g_strdup (urn), GINT_TO_POINTER (state));
}
- tracker_result_iterator_free (iterator);
+ g_object_unref (cursor);
/* Then, get all currently mounted non-REMOVABLE volumes, according to GIO */
uuids = tracker_storage_get_device_uuids (priv->storage, 0, TRUE);
diff --git a/tests/libtracker-data/tracker-ontology-change-test.c b/tests/libtracker-data/tracker-ontology-change-test.c
index 5893589..9ae8beb 100644
--- a/tests/libtracker-data/tracker-ontology-change-test.c
+++ b/tests/libtracker-data/tracker-ontology-change-test.c
@@ -252,9 +252,7 @@ test_ontology_change (void)
gchar *query = strtok (queries, "\n");
while (query) {
- tracker_data_begin_db_transaction ();
tracker_data_update_sparql (query, &error);
- tracker_data_commit_db_transaction ();
g_assert_no_error (error);
query = strtok (NULL, "\n");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]