X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=bindings%2Fruby%2Ftags.c;h=d7cd941d3bdba825d29f771114d158c61d7327f9;hb=44ea57a0d10ddab514abea319c4d25ec4e36b51e;hp=d0a5054ad002940a86263332f33f68bd14f8117c;hpb=06bf04500ba282052d38adf428219968ae62bb54;p=notmuch

diff --git a/bindings/ruby/tags.c b/bindings/ruby/tags.c
index d0a5054a..d7cd941d 100644
--- a/bindings/ruby/tags.c
+++ b/bindings/ruby/tags.c
@@ -20,6 +20,24 @@
 
 #include "defs.h"
 
+/*
+ * call-seq: TAGS.destroy => nil
+ *
+ * Destroys the tags, freeing all resources allocated for it.
+ */
+VALUE
+notmuch_rb_tags_destroy(VALUE self)
+{
+    notmuch_tags_t *tags;
+
+    Data_Get_Notmuch_Tags(self, tags);
+
+    notmuch_tags_destroy(tags);
+    DATA_PTR(self) = NULL;
+
+    return Qnil;
+}
+
 /*
  * call-seq: TAGS.each {|item| block } => TAGS
  *
@@ -30,16 +48,13 @@ VALUE
 notmuch_rb_tags_each(VALUE self)
 {
     const char *tag;
-    notmuch_rb_tags_t *tags;
+    notmuch_tags_t *tags;
 
-    Data_Get_Struct(self, notmuch_rb_tags_t, tags);
-    if (!tags->nm_tags)
-        return self;
+    Data_Get_Notmuch_Tags(self, tags);
 
-    for (; notmuch_tags_valid(tags->nm_tags);
-            notmuch_tags_move_to_next(tags->nm_tags)) {
-        tag = notmuch_tags_get(tags->nm_tags);
-        rb_yield(tag ? rb_str_new2(tag) : Qnil);
+    for (; notmuch_tags_valid(tags); notmuch_tags_move_to_next(tags)) {
+        tag = notmuch_tags_get(tags);
+        rb_yield(rb_str_new2(tag));
     }
 
     return self;