diff options
author | Ray Strode <rstrode@redhat.com> | 2018-03-23 11:03:52 -0400 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2018-03-28 16:46:36 -0400 |
commit | 4c74e80ac57ee6ce97727bbbff07314ece1ae0c1 (patch) | |
tree | 1b05f2f20250f46545b690486b9ed3a35d539a01 | |
parent | a8ba16278d9eea8bf8d43f2fd9e01dd218174a83 (diff) | |
download | polkit-4c74e80ac57ee6ce97727bbbff07314ece1ae0c1.tar.gz |
jsauthority: stop using JS_GetStringCharsZ
it's not around anymore.
-rw-r--r-- | src/polkitbackend/polkitbackendjsauthority.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp index 8fce42c..cb4b60f 100644 --- a/src/polkitbackend/polkitbackendjsauthority.cpp +++ b/src/polkitbackend/polkitbackendjsauthority.cpp @@ -1085,7 +1085,7 @@ polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveA JS::RootedValue rval(authority->priv->cx); guint n; GError *error = NULL; - JSString *ret_jsstr; + JS::RootedString ret_jsstr (authority->priv->cx); gchar *ret_str = NULL; gchar **ret_strs = NULL; @@ -1132,10 +1132,10 @@ polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveA } ret_jsstr = rval.toString(); - ret_str = g_utf16_to_utf8 (JS_GetStringCharsZ (authority->priv->cx, ret_jsstr), -1, NULL, NULL, NULL); + ret_str = JS_EncodeStringToUTF8 (authority->priv->cx, ret_jsstr); if (ret_str == NULL) { - g_warning ("Error converting resulting string to UTF-8: %s", error->message); + g_warning ("Error converting resulting string to UTF-8"); goto out; } @@ -1192,8 +1192,7 @@ polkit_backend_js_authority_check_authorization_sync (PolkitBackendInteractiveAu JS::AutoValueArray<2> args(authority->priv->cx); JS::RootedValue rval(authority->priv->cx); GError *error = NULL; - JSString *ret_jsstr; - const jschar *ret_utf16; + JS::RootedString ret_jsstr (authority->priv->cx); gchar *ret_str = NULL; gboolean good = FALSE; @@ -1247,12 +1246,10 @@ polkit_backend_js_authority_check_authorization_sync (PolkitBackendInteractiveAu } ret_jsstr = rval.toString(); - ret_utf16 = JS_GetStringCharsZ (authority->priv->cx, ret_jsstr); - ret_str = g_utf16_to_utf8 (ret_utf16, -1, NULL, NULL, &error); + ret_str = JS_EncodeStringToUTF8 (authority->priv->cx, ret_jsstr); if (ret_str == NULL) { - g_warning ("Error converting resulting string to UTF-8: %s", error->message); - g_clear_error (&error); + g_warning ("Error converting resulting string to UTF-8"); goto out; } |