summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2018-03-22 13:00:33 -0400
committerRay Strode <rstrode@redhat.com>2018-03-28 16:46:35 -0400
commit8a043c96a6f65d8d1221dba8711b942e14c7a376 (patch)
tree83552a068ce501452a5f664b0330bf961cf936d4
parente4ef144dc47dbb8bad246a87ca18b5c6a4afd232 (diff)
downloadpolkit-8a043c96a6f65d8d1221dba8711b942e14c7a376.tar.gz
jsauthority: s/STRING_TO_JSVAL/JS::StringValue/
-rw-r--r--src/polkitbackend/polkitbackendjsauthority.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp
index 748343d..83f8846 100644
--- a/src/polkitbackend/polkitbackendjsauthority.cpp
+++ b/src/polkitbackend/polkitbackendjsauthority.cpp
@@ -681,7 +681,7 @@ 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);
+ value_jsval = JS::StringValue (value_jsstr);
JS_SetProperty (authority->priv->cx, obj, name, &value_jsval);
}
@@ -704,7 +704,7 @@ set_property_strv (PolkitBackendJsAuthority *authority,
JS::Value val;
jsstr = JS_NewStringCopyZ (authority->priv->cx, (char *)g_ptr_array_index(value, n));
- val = STRING_TO_JSVAL (jsstr);
+ val = JS::StringValue (jsstr);
JS_SetElement (authority->priv->cx, array_object, n, &val);
}
@@ -977,7 +977,7 @@ js_operation_callback (JSContext *cx)
/* Throw an exception - this way the JS code can ignore the runaway script handling */
JS_SetOperationCallback (authority->priv->cx, NULL);
val_str = JS_NewStringCopyZ (cx, "Terminating runaway script");
- val = STRING_TO_JSVAL (val_str);
+ val = JS::StringValue (val_str);
JS_SetPendingException (authority->priv->cx, val);
JS_SetOperationCallback (authority->priv->cx, js_operation_callback);
return false;
@@ -1472,7 +1472,7 @@ js_polkit_spawn (JSContext *cx,
ret = true;
ret_jsstr = JS_NewStringCopyZ (cx, standard_output);
- JS_SET_RVAL (cx, vp, STRING_TO_JSVAL (ret_jsstr));
+ JS_SET_RVAL (cx, vp, JS::StringValue (ret_jsstr));
out:
g_strfreev (argv);