From: Austin Clements <amdragon@MIT.EDU>
Date: Mon, 30 Apr 2012 16:25:37 +0000 (-0400)
Subject: ruby: Update Ruby bindings for new notmuch_database_{open, create} signatures
X-Git-Tag: 0.13_rc1~17
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=9721343e5b75e0e5a305ef32358fd83dcde650b4;ds=sidebyside

ruby: Update Ruby bindings for new notmuch_database_{open, create} signatures
---

diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c
index ba9a1391..409d54fa 100644
--- a/bindings/ruby/database.c
+++ b/bindings/ruby/database.c
@@ -42,6 +42,8 @@ notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE self)
     int create, mode;
     VALUE pathv, hashv;
     VALUE modev;
+    notmuch_database_t *database;
+    notmuch_status_t ret;
 
     /* Check arguments */
     rb_scan_args (argc, argv, "11", &pathv, &hashv);
@@ -73,9 +75,13 @@ notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE self)
     }
 
     Check_Type (self, T_DATA);
-    DATA_PTR (self) = create ? notmuch_database_create (path) : notmuch_database_open (path, mode);
-    if (!DATA_PTR (self))
-	rb_raise (notmuch_rb_eDatabaseError, "Failed to open database");
+    if (create)
+	ret = notmuch_database_create (path, &database);
+    else
+	ret = notmuch_database_open (path, mode, &database);
+    notmuch_rb_status_raise (ret);
+
+    DATA_PTR (self) = database;
 
     return self;
 }