node-gtk 0.12.1 → 0.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-gtk",
-  "version": "0.12.1",
+  "version": "0.14.0",
   "description": "GNOME Gtk+ bindings for NodeJS",
   "main": "lib/index.js",
   "scripts": {

package/scripts/ci.sh

@@ -47,7 +47,7 @@ function npm_test() {
                   --skip=error                    \
                   tests/__run__.js
     else
-        xvfb-run -a npm test;
+        xvfb-run -a npm test -- --skip=callback;
     fi;
 }
 

package/src/callback.cc

@@ -32,13 +32,21 @@ static Local<Object> GetSelfInstance(GIArgument **args) {
 Callback::Callback(Local<Function> fn, GICallableInfo* callback_info, GIScopeType scope_type_) {
     persistent.Reset(fn);
     info = g_base_info_ref (callback_info);
+    #ifdef GI_AVAILABLE_IN_1_72
     closure = g_callable_info_create_closure(info, &cif, Callback::Call, this);
+    #else
+    closure = g_callable_info_prepare_closure(info, &cif, Callback::Call, this);
+    #endif
     scope_type = scope_type_;
 }
 
 Callback::~Callback() {
     persistent.Reset();
+    #ifdef GI_AVAILABLE_IN_1_72
     g_callable_info_destroy_closure (this->info, this->closure);
+    #else
+    g_callable_info_free_closure (this->info, this->closure);
+    #endif
     g_base_info_unref (this->info);
 }
 

package/src/gobject.cc

@@ -120,11 +120,15 @@ static void AssociateGObject(Local<Object> object, GObject *gobject, GType gtype
 
     SET_OBJECT_GTYPE(object, gtype);
 
-    g_object_ref_sink (gobject);
-    g_object_add_toggle_ref (gobject, ToggleNotify, NULL);
-
     Persistent<Object> *persistent = new Persistent<Object>(object);
     g_object_set_qdata (gobject, GNodeJS::object_quark(), persistent);
+
+    // Because we can't sink floating ref and add toggle ref at the same time,
+    // first sink the floating ref, add the toggle ref, and then release the
+    // ref we've just sunken. At the end, we must carry only the toggle ref.
+    g_object_ref_sink (gobject);
+    g_object_add_toggle_ref (gobject, ToggleNotify, NULL);
+    g_object_unref (gobject);
 }
 
 static void GObjectConstructor(const FunctionCallbackInfo<Value> &info) {
@@ -168,6 +172,12 @@ static void GObjectConstructor(const FunctionCallbackInfo<Value> &info) {
     }
 
     AssociateGObject(self, gobject, gtype);
+    if (G_IS_INITIALLY_UNOWNED(gobject)) {
+        // AssociateGObject() has sunken the floating ref.
+    } else {
+        // AssociateGObject() has added its own ref.
+        g_object_unref(gobject);
+    }
 }
 
 static void GObjectDestroyed(const Nan::WeakCallbackInfo<GObject> &data) {
@@ -181,7 +191,7 @@ static void GObjectDestroyed(const Nan::WeakCallbackInfo<GObject> &data) {
      * the qdata that points back to us. */
     g_object_set_qdata (gobject, GNodeJS::object_quark(), NULL);
 
-    g_object_unref (gobject);
+    g_object_remove_toggle_ref (gobject, &ToggleNotify, NULL);
 }
 
 static void GObjectClassDestroyed(const Nan::WeakCallbackInfo<GType> &info) {

package/src/value.cc

@@ -1169,8 +1169,16 @@ void FreeGIArgument(GITypeInfo *type_info, GIArgument *arg, GITransfer transfer,
         GIInfoType  i_type = g_base_info_get_type(i_info);
         switch (i_type) {
             case GI_INFO_TYPE_OBJECT:
-            case GI_INFO_TYPE_INTERFACE: // TODO(validate interface are handled)
-                // handled by gobject.cc/boxed.cc
+            case GI_INFO_TYPE_INTERFACE:
+                if (is_out) {
+                    // WrapperFromGObject() have either created a new wrapper
+                    // taking it's own ref in process, or given an existing
+                    // wrapper with existing ref.
+                    g_object_unref(arg->v_pointer);
+                } else {
+                    // GObjectFromWrapper() haven't given an additional ref.
+                    // Thus, do nothing.
+                }
                 break;
             case GI_INFO_TYPE_BOXED:
             case GI_INFO_TYPE_STRUCT: