From 5c0fbed84bd235d019eda2de33f0d4a3be5f7006 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 22 Mar 2018 13:00:33 -0400 Subject: [PATCH] jsauthority: s/OBJECT_TO_JSVAL/JS::ObjectValue/ This commit does a global search and replace for OBJECT_TO_JSVAL to JS::ObjectValue() Signed-off-by: Ray Strode https://bugs.freedesktop.org/show_bug.cgi?id=105865 --- src/polkitbackend/polkitbackendjsauthority.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp index cef1b1a..5bbf125 100644 --- a/src/polkitbackend/polkitbackendjsauthority.cpp +++ b/src/polkitbackend/polkitbackendjsauthority.cpp @@ -670,61 +670,61 @@ set_property_str (PolkitBackendJsAuthority *authority, JSString *value_jsstr; JS::Value value_jsval; value_jsstr = JS_NewStringCopyZ (authority->priv->cx, value); value_jsval = STRING_TO_JSVAL (value_jsstr); JS_SetProperty (authority->priv->cx, obj, name, &value_jsval); } /* authority->priv->cx must be within a request */ static void set_property_strv (PolkitBackendJsAuthority *authority, JSObject *obj, const gchar *name, GPtrArray *value) { JS::Value value_jsval; JSObject *array_object; guint n; array_object = JS_NewArrayObject (authority->priv->cx, 0, NULL); for (n = 0; n < value->len; n++) { JSString *jsstr; JS::Value val; jsstr = JS_NewStringCopyZ (authority->priv->cx, (char *)g_ptr_array_index(value, n)); val = STRING_TO_JSVAL (jsstr); JS_SetElement (authority->priv->cx, array_object, n, &val); } - value_jsval = OBJECT_TO_JSVAL (array_object); + value_jsval = JS::ObjectValue (*array_object); JS_SetProperty (authority->priv->cx, obj, name, &value_jsval); } /* authority->priv->cx must be within a request */ static void set_property_int32 (PolkitBackendJsAuthority *authority, JSObject *obj, const gchar *name, gint32 value) { JS::Value value_jsval; value_jsval = INT_TO_JSVAL ((gint32) value); JS_SetProperty (authority->priv->cx, obj, name, &value_jsval); } /* authority->priv->cx must be within a request */ static void set_property_bool (PolkitBackendJsAuthority *authority, JSObject *obj, const gchar *name, gboolean value) { JS::Value value_jsval; value_jsval = BOOLEAN_TO_JSVAL ((bool) value); JS_SetProperty (authority->priv->cx, obj, name, &value_jsval); } /* ---------------------------------------------------------------------------------------------------- */ /* authority->priv->cx must be within a request */ -- 2.16.2