[gnome-logs/wip/larsu/listmodel: 8/18] journal: don't run query_async in a thread

[Lars Uebernickel <larsu src gnome org>]

commit 688452d24288f2c6080cd6139622c200a1f21f17
Author: Lars Uebernickel <lars uebernic de>
Date:   Sat Feb 14 19:41:56 2015 +0100

    journal: don't run query_async in a thread
    
    This was quite unsafe due to lack of any locking.

 src/gl-journal.c |   24 ++++++------------------
 1 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/src/gl-journal.c b/src/gl-journal.c
index 35fd74c..83170d8 100644
--- a/src/gl-journal.c
+++ b/src/gl-journal.c
@@ -348,22 +348,6 @@ gl_journal_query_free (GlJournalQuery *query)
     g_slice_free (GlJournalQuery, query);
 }
 
-static void
-gl_journal_query_async_thread (GTask *task,
-                               gpointer source_object,
-                               gpointer task_data,
-                               GCancellable *cancellable)
-{
-    GList *results;
-
-    /* TODO: gl_journal_query() should accept a cancellable. */
-    results = gl_journal_query (GL_JOURNAL (source_object),
-                                (GlJournalQuery *)task_data);
-    g_task_return_pointer (task, results,
-                           (GDestroyNotify)gl_journal_results_free);
-    /* TODO: Return error if necessary (if cancelled?). */
-}
-
 void
 gl_journal_query_async (GlJournal *self,
                         const GlJournalQuery *query,
@@ -373,12 +357,16 @@ gl_journal_query_async (GlJournal *self,
 {
     GTask *task;
     GlJournalQuery *data;
+    GList *results;
 
     data = gl_journal_query_copy (query);
 
     task = g_task_new (self, cancellable, callback, user_data);
-    g_task_set_task_data (task, data, (GDestroyNotify)gl_journal_query_free);
-    g_task_run_in_thread (task, gl_journal_query_async_thread);
+    g_task_set_task_data (task, data, (GDestroyNotify) gl_journal_query_free);
+
+    results = gl_journal_query (self, query);
+    g_task_return_pointer (task, results, (GDestroyNotify) gl_journal_results_free);
+
     g_object_unref (task);
 }