[tracker/libtracker-sparql-porting: 14/42] Rebase fixes
- From: Jürg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/libtracker-sparql-porting: 14/42] Rebase fixes
- Date: Tue, 10 Aug 2010 14:09:12 +0000 (UTC)
commit a8024e92b21b3d45b86883bb049754bebd6dafa5
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 ++----
2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index 9a24993..ecc9f3f 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,
@@ -2591,7 +2591,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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]