tags: Replace sort() and reset() with prepare_iterator().

[notmuch] / query.cc

diff --git a/query.cc b/query.cc
index b454560ace1723b315d336c9e4165559a3b9b0d6..4df2f52ff65ce8b39294828eb47c2dd0159320af 100644 (file)
--- a/query.cc
+++ b/query.cc
@@ -158,6 +158,18 @@ notmuch_query_search_messages (notmuch_query_t *query)
     return results;
 }
 
+/* Glib objects force use to use a talloc destructor as well, (but not
+ * nearly as ugly as the for message_results due to C++ objects). At
+ * this point, I'd really like to have some talloc-friendly
+ * equivalents for the few pieces of glib that I'm using. */
+static int
+_notmuch_thread_results_destructor (notmuch_thread_results_t *results)
+{
+    g_ptr_array_free (results->thread_ids, TRUE);
+
+    return 0;
+}
+
 notmuch_thread_results_t *
 notmuch_query_search_threads (notmuch_query_t *query)
 {
@@ -175,6 +187,8 @@ notmuch_query_search_threads (notmuch_query_t *query)
     thread_results->thread_ids = g_ptr_array_new ();
     thread_results->index = 0;
 
+    talloc_set_destructor (thread_results, _notmuch_thread_results_destructor);
+
     seen = g_hash_table_new_full (g_str_hash, g_str_equal,
                                  free, NULL);
 
@@ -221,6 +235,9 @@ notmuch_message_results_get (notmuch_message_results_t *results)
     Xapian::docid doc_id;
     notmuch_private_status_t status;
 
+    if (! notmuch_message_results_has_more (results))
+       return NULL;
+
     doc_id = *results->iterator;
 
     message = _notmuch_message_create (results,
@@ -260,6 +277,9 @@ notmuch_thread_results_get (notmuch_thread_results_t *results)
     notmuch_thread_t *thread;
     const char *thread_id;
 
+    if (! notmuch_thread_results_has_more (results))
+       return NULL;
+
     thread_id = (const char *) g_ptr_array_index (results->thread_ids,
                                                  results->index);
 
@@ -279,6 +299,5 @@ notmuch_thread_results_advance (notmuch_thread_results_t *results)
 void
 notmuch_thread_results_destroy (notmuch_thread_results_t *results)
 {
-    g_ptr_array_free (results->thread_ids, TRUE);
     talloc_free (results);
 }