X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=bindings%2Fruby%2Fquery.c;h=c5b8a4cc324f278ed6ff0ec17007c8eb90c01538;hp=5140c0083b25c0becbc85223ef568117fc5e5fdc;hb=44ea57a0d10ddab514abea319c4d25ec4e36b51e;hpb=c7893408bbe6904ae7da97aa203587af4ec2fac7

diff --git a/bindings/ruby/query.c b/bindings/ruby/query.c
index 5140c008..c5b8a4cc 100644
--- a/bindings/ruby/query.c
+++ b/bindings/ruby/query.c
@@ -30,9 +30,10 @@ notmuch_rb_query_destroy(VALUE self)
 {
     notmuch_query_t *query;
 
-    Data_Get_Struct(self, notmuch_query_t, query);
+    Data_Get_Notmuch_Query(self, query);
 
     notmuch_query_destroy(query);
+    DATA_PTR(self) = NULL;
 
     return Qnil;
 }
@@ -47,10 +48,10 @@ notmuch_rb_query_set_sort(VALUE self, VALUE sortv)
 {
     notmuch_query_t *query;
 
-    Data_Get_Struct(self, notmuch_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));
 
@@ -68,7 +69,7 @@ notmuch_rb_query_search_threads(VALUE self)
     notmuch_query_t *query;
     notmuch_threads_t *threads;
 
-    Data_Get_Struct(self, notmuch_query_t, query);
+    Data_Get_Notmuch_Query(self, query);
 
     threads = notmuch_query_search_threads(query);
     if (!threads)
@@ -88,7 +89,7 @@ notmuch_rb_query_search_messages(VALUE self)
     notmuch_query_t *query;
     notmuch_messages_t *messages;
 
-    Data_Get_Struct(self, notmuch_query_t, query);
+    Data_Get_Notmuch_Query(self, query);
 
     messages = notmuch_query_search_messages(query);
     if (!messages)