diff options
| author | Tim Lunn <tim@feathertop.org> | 2013-10-01 09:23:48 +1000 |
|---|---|---|
| committer | Tim Lunn <tim@feathertop.org> | 2013-11-09 07:30:59 +1100 |
| commit | a3241ac8520053dbf3185c8f171c7a6d81487b52 (patch) | |
| tree | a7142bd5a49b2b7a8de11b682fc4b4c1f86946a9 /gjs/context.cpp | |
| parent | e82315c477e2a95e914555db575facfaa1893311 (diff) | |
| download | gjs-wip/js24.tar.gz | |
JS_SetVersion has been removed, JS Version is now set on the compartment instead of context.wip/js24
https://bugzilla.gnome.org/show_bug.cgi?id=711046
Diffstat (limited to 'gjs/context.cpp')
| -rw-r--r-- | gjs/context.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gjs/context.cpp b/gjs/context.cpp index 1dfac08b..f5bd933e 100644 --- a/gjs/context.cpp +++ b/gjs/context.cpp @@ -608,18 +608,10 @@ gjs_context_constructor (GType type, */ if (js_version == JSVERSION_UNKNOWN) js_version = JSVERSION_DEFAULT; - /* Set the version if we need to. */ - if (js_version != JSVERSION_DEFAULT && JS_GetVersion(js_context->context) != js_version) { - gjs_debug(GJS_DEBUG_CONTEXT, - "Changing JavaScript version to %s from %s", - JS_VersionToString(js_version), - JS_VersionToString(JS_GetVersion(js_context->context))); - - JS_SetVersion(js_context->context, js_version); - } - if (!gjs_init_context_standard(js_context->context)) + if (!gjs_init_context_standard(js_context->context, js_version)) g_error("Failed to initialize context"); + js_context->global = JS_GetGlobalObject(js_context->context); JSAutoCompartment ac(js_context->context, js_context->global); |