ruby: Update for changes to notmuch_database_get_directory

[notmuch] / bindings / ruby / threads.c

diff --git a/bindings/ruby/threads.c b/bindings/ruby/threads.c
index cee6afbe018f1abd26d07eafe6e2b8440b8277c8..3e1fbf5d01558775017334ede827447cfd7759ce 100644 (file)
--- a/bindings/ruby/threads.c
+++ b/bindings/ruby/threads.c
@@ -1,6 +1,6 @@
 /* The Ruby interface to the notmuch mail library
  *
- * Copyright © 2010 Ali Polatel
+ * Copyright © 2010, 2011 Ali Polatel
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,30 +20,40 @@
 
 #include "defs.h"
 
+/*
+ * call-seq: THREADS.destroy! => nil
+ *
+ * Destroys the threads, freeing all resources allocated for it.
+ */
+VALUE
+notmuch_rb_threads_destroy (VALUE self)
+{
+    notmuch_threads_t *threads;
+
+    Data_Get_Struct (self, notmuch_threads_t, threads);
+
+    notmuch_threads_destroy (threads);
+    DATA_PTR (self) = NULL;
+
+    return Qnil;
+}
+
 /* call-seq: THREADS.each {|item| block } => THREADS
  *
  * Calls +block+ once for each thread in +self+, passing that element as a
  * parameter.
  */
 VALUE
-notmuch_rb_threads_each(VALUE self)
+notmuch_rb_threads_each (VALUE self)
 {
-    notmuch_rb_thread_t *thread;
-    notmuch_rb_threads_t *threads;
-    VALUE threadv;
-
-    Data_Get_Struct(self, notmuch_rb_threads_t, threads);
-    if (!threads->nm_threads)
-        return self;
-
-    for (; notmuch_threads_valid(threads->nm_threads);
-            notmuch_threads_move_to_next(threads->nm_threads))
-    {
-        threadv = Data_Make_Struct(notmuch_rb_cThread, notmuch_rb_thread_t,
-                notmuch_rb_thread_mark, notmuch_rb_thread_free, thread);
-        thread->nm_thread = notmuch_threads_get(threads->nm_threads);
-        thread->threads = self;
-        rb_yield(threadv);
+    notmuch_thread_t *thread;
+    notmuch_threads_t *threads;
+
+    Data_Get_Notmuch_Threads (self, threads);
+
+    for (; notmuch_threads_valid (threads); notmuch_threads_move_to_next (threads)) {
+       thread = notmuch_threads_get (threads);
+       rb_yield (Data_Wrap_Struct (notmuch_rb_cThread, NULL, NULL, thread));
     }
 
     return self;