summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2010-10-29 17:27:07 -0400
committerColin Walters <walters@verbum.org>2010-11-12 17:41:37 -0500
commit728b84712b05cd55dd8e30de2fc672f930dcfa7a (patch)
treec20d0cc6c9b116a4ac32ea63bedbbc87736579ba
parent74225ded652b92696b7b61475f7e0d4ca73f69c9 (diff)
downloadgjs-wip/xulrunner-2-rebase5.tar.gz
[REBASE] Add missing return value set in success pathwip/xulrunner-2-rebase5
-rw-r--r--gi/boxed.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/gi/boxed.c b/gi/boxed.c
index d474bcda..f27a8997 100644
--- a/gi/boxed.c
+++ b/gi/boxed.c
@@ -516,7 +516,8 @@ GJS_NATIVE_CONSTRUCTOR_DECLARE(boxed)
unthreadsafe_template_for_constructor.gboxed = NULL;
} else {
GType gtype = g_registered_type_info_get_g_type( (GIRegisteredTypeInfo*) priv->info);
-
+ JSBool retval;
+
if (gtype != G_TYPE_NONE) {
priv->gboxed = g_boxed_copy(gtype,
unthreadsafe_template_for_constructor.gboxed);
@@ -535,7 +536,10 @@ GJS_NATIVE_CONSTRUCTOR_DECLARE(boxed)
unthreadsafe_template_for_constructor.gboxed = NULL;
- return priv->gboxed != NULL;
+ retval = priv->gboxed != NULL;
+ if (retval)
+ GJS_NATIVE_CONSTRUCTOR_FINISH(boxed);
+ return retval;
}
}