brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell-js: Remove usage of deprecated API

Browse Source 
This removes all usage of SpiderMonkey API that is deprecated in mozjs24
and will be removed in mozjs31.

https://bugzilla.gnome.org/show_bug.cgi?id=742249
This commit is contained in:
Philip Chimento 2016-09-25 22:29:49 -07:00
parent 717c0ea19f
commit f00826f3fb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/shell-js.cpp
View File

@ -27,7 +27,7 @@ shell_js_add_extension_importer (const char *target_object_script,
const char *directory, const char *directory,
GError **error) GError **error)
{ {
jsval target_object; JS::Value target_object;
GList *contexts; GList *contexts;
JSContext *context; JSContext *context;
char *search_path[2] = { 0, 0 }; char *search_path[2] = { 0, 0 };
@ -46,7 +46,7 @@ shell_js_add_extension_importer (const char *target_object_script,
* object directly into this function, but introspection doesn't * object directly into this function, but introspection doesn't
* support that at the moment. Instead evaluate a string to get it. */ * support that at the moment. Instead evaluate a string to get it. */
if (!JS_EvaluateScript(context, if (!JS_EvaluateScript(context,
JS_GetGlobalObject(context), gjs_get_global_object (context),
target_object_script, target_object_script,
strlen (target_object_script), strlen (target_object_script),
"<target_object_script>", "<target_object_script>",
@ -61,14 +61,15 @@ shell_js_add_extension_importer (const char *target_object_script,
goto out; goto out;
} }
if (!JSVAL_IS_OBJECT (target_object)) if (!target_object.isObject ())
{ {
g_error ("shell_js_add_extension_importer: invalid target object"); g_error ("shell_js_add_extension_importer: invalid target object");
goto out; goto out;
} }
search_path[0] = (char*)directory; search_path[0] = (char*)directory;
gjs_define_importer (context, JSVAL_TO_OBJECT (target_object), target_property, (const char **)search_path, FALSE); gjs_define_importer (context, &target_object.toObject (), target_property,
(const char **)search_path, FALSE);
ret = TRUE; ret = TRUE;
out: out: