diff options
Diffstat (limited to 'src/miners/apps/tracker-miner-applications.c')
| -rw-r--r-- | src/miners/apps/tracker-miner-applications.c | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/miners/apps/tracker-miner-applications.c b/src/miners/apps/tracker-miner-applications.c index 6f9260352..348c3e036 100644 --- a/src/miners/apps/tracker-miner-applications.c +++ b/src/miners/apps/tracker-miner-applications.c @@ -38,12 +38,10 @@ static gboolean miner_applications_initable_init (GInitable GError **error); static gboolean miner_applications_process_file (TrackerMinerFS *fs, GFile *file, - TrackerSparqlBuilder *sparql, - GCancellable *cancellable); + GTask *task); static gboolean miner_applications_process_file_attributes (TrackerMinerFS *fs, GFile *file, - TrackerSparqlBuilder *sparql, - GCancellable *cancellable); + GTask *task); static GQuark miner_applications_error_quark = 0; @@ -56,6 +54,7 @@ struct ProcessApplicationData { GCancellable *cancellable; GKeyFile *key_file; gchar *type; + GTask *task; }; static GInitableIface* miner_applications_initable_parent_iface; @@ -830,6 +829,7 @@ process_application_data_free (ProcessApplicationData *data) g_object_unref (data->file); g_object_unref (data->sparql); g_object_unref (data->cancellable); + g_object_unref (data->task); g_free (data->type); if (data->key_file) { @@ -854,9 +854,8 @@ process_file_cb (GObject *object, file_info = g_file_query_info_finish (file, result, &error); if (error) { - tracker_miner_fs_file_notify (TRACKER_MINER_FS (data->miner), file, error); + tracker_miner_fs_notify_finish (TRACKER_MINER_FS (data->miner), data->task, NULL, error); process_application_data_free (data); - g_error_free (error); return; } @@ -882,13 +881,11 @@ process_file_cb (GObject *object, } } - tracker_miner_fs_file_notify (TRACKER_MINER_FS (data->miner), data->file, error); + tracker_miner_fs_notify_finish (TRACKER_MINER_FS (data->miner), data->task, + tracker_sparql_builder_get_result (data->sparql), + error); process_application_data_free (data); - if (error) { - g_error_free (error); - } - if (file_info) { g_object_unref (file_info); } @@ -897,17 +894,17 @@ process_file_cb (GObject *object, static gboolean miner_applications_process_file (TrackerMinerFS *fs, GFile *file, - TrackerSparqlBuilder *sparql, - GCancellable *cancellable) + GTask *task) { ProcessApplicationData *data; const gchar *attrs; data = g_slice_new0 (ProcessApplicationData); data->miner = g_object_ref (fs); - data->sparql = g_object_ref (sparql); + data->sparql = tracker_sparql_builder_new_update (); data->file = g_object_ref (file); - data->cancellable = g_object_ref (cancellable); + data->cancellable = g_object_ref (g_task_get_cancellable (task)); + data->task = g_object_ref (task); attrs = G_FILE_ATTRIBUTE_TIME_MODIFIED "," G_FILE_ATTRIBUTE_STANDARD_TYPE; @@ -916,7 +913,7 @@ miner_applications_process_file (TrackerMinerFS *fs, attrs, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_PRIORITY_DEFAULT, - cancellable, + data->cancellable, process_file_cb, data); @@ -926,8 +923,7 @@ miner_applications_process_file (TrackerMinerFS *fs, static gboolean miner_applications_process_file_attributes (TrackerMinerFS *fs, GFile *file, - TrackerSparqlBuilder *sparql, - GCancellable *cancellable) + GTask *task) { gchar *uri; |