X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=bindings%2Fruby%2Fquery.c;h=c5b8a4cc324f278ed6ff0ec17007c8eb90c01538;hp=50edf170893df3cb6795778d9e906f1cc3b007cf;hb=5c9e385591b66fa20cbb186393c48c52831a23b7;hpb=06bf04500ba282052d38adf428219968ae62bb54

diff --git a/bindings/ruby/query.c b/bindings/ruby/query.c
index 50edf170..c5b8a4cc 100644
--- a/bindings/ruby/query.c
+++ b/bindings/ruby/query.c
@@ -20,6 +20,24 @@
 
 #include "defs.h"
 
+/*
+ * call-seq: QUERY.destroy => nil
+ *
+ * Destroys the query, freeing all resources allocated for it.
+ */
+VALUE
+notmuch_rb_query_destroy(VALUE self)
+{
+    notmuch_query_t *query;
+
+    Data_Get_Notmuch_Query(self, query);
+
+    notmuch_query_destroy(query);
+    DATA_PTR(self) = NULL;
+
+    return Qnil;
+}
+
 /*
  * call-seq: QUERY.sort=(fixnum) => nil
  *
@@ -28,14 +46,15 @@
 VALUE
 notmuch_rb_query_set_sort(VALUE self, VALUE sortv)
 {
-    notmuch_rb_query_t *query;
+    notmuch_query_t *query;
 
-    Data_Get_Struct(self, notmuch_rb_query_t, query);
+    Data_Get_Notmuch_Query(self, query);
 
     if (!FIXNUM_P(sortv))
-        rb_raise(rb_eTypeError, "Not a fixnum");
+        rb_raise(rb_eTypeError, "Not a Fixnum");
+
+    notmuch_query_set_sort(query, FIX2UINT(sortv));
 
-    notmuch_query_set_sort(query->nm_query, FIX2UINT(sortv));
     return Qnil;
 }
 
@@ -47,20 +66,16 @@ notmuch_rb_query_set_sort(VALUE self, VALUE sortv)
 VALUE
 notmuch_rb_query_search_threads(VALUE self)
 {
-    notmuch_rb_query_t *query;
-    notmuch_rb_threads_t *threads;
-    VALUE threadsv;
+    notmuch_query_t *query;
+    notmuch_threads_t *threads;
 
-    Data_Get_Struct(self, notmuch_rb_query_t, query);
+    Data_Get_Notmuch_Query(self, query);
 
-    threadsv = Data_Make_Struct(notmuch_rb_cThreads, notmuch_rb_threads_t,
-            notmuch_rb_threads_mark, notmuch_rb_threads_free, threads);
-    threads->nm_threads = notmuch_query_search_threads(query->nm_query);
-    threads->query = self;
-    if (!threads->nm_threads)
-        rb_raise(notmuch_rb_eMemoryError, "out of memory");
+    threads = notmuch_query_search_threads(query);
+    if (!threads)
+        rb_raise(notmuch_rb_eMemoryError, "Out of memory");
 
-    return threadsv;
+    return Data_Wrap_Struct(notmuch_rb_cThreads, NULL, NULL, threads);
 }
 
 /*
@@ -71,18 +86,14 @@ notmuch_rb_query_search_threads(VALUE self)
 VALUE
 notmuch_rb_query_search_messages(VALUE self)
 {
-    notmuch_rb_query_t *query;
-    notmuch_rb_messages_t *messages;
-    VALUE messagesv;
+    notmuch_query_t *query;
+    notmuch_messages_t *messages;
 
-    Data_Get_Struct(self, notmuch_rb_query_t, query);
+    Data_Get_Notmuch_Query(self, query);
 
-    messagesv = Data_Make_Struct(notmuch_rb_cMessages, notmuch_rb_messages_t,
-            notmuch_rb_messages_mark, notmuch_rb_messages_free, messages);
-    messages->nm_messages = notmuch_query_search_messages(query->nm_query);
-    messages->parent = self;
-    if (!messages->nm_messages)
-        rb_raise(notmuch_rb_eMemoryError, "out of memory");
+    messages = notmuch_query_search_messages(query);
+    if (!messages)
+        rb_raise(notmuch_rb_eMemoryError, "Out of memory");
 
-    return messagesv;
+    return Data_Wrap_Struct(notmuch_rb_cMessages, NULL, NULL, messages);
 }