diff options
| author | Adam Domurad <[email protected]> | 2012-06-04 12:07:33 -0400 |
|---|---|---|
| committer | Adam Domurad <[email protected]> | 2012-06-04 12:07:33 -0400 |
| commit | 3a45053d393b828faa8a5db3febc1d28e6952ce7 (patch) | |
| tree | a9a0373c01b55339606a279ad2b535ae7a5d7370 /plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | |
| parent | f96a26930b07f3f1fd0a8890230d816cb3c2fdc3 (diff) | |
Fix for PR518, adds utility function for wrapping NPString
in std::string.
Diffstat (limited to 'plugin/icedteanp/IcedTeaJavaRequestProcessor.cc')
| -rw-r--r-- | plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc index 1431bcc..c20a317 100644 --- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc +++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc @@ -904,11 +904,7 @@ createJavaObjectFromVariant(NPP instance, NPVariant variant, std::string* id) } else if (NPVARIANT_IS_STRING(variant)) { className = "java.lang.String"; -#if MOZILLA_VERSION_COLLAPSED < 1090200 - stringArg.append(NPVARIANT_TO_STRING(variant).utf8characters, NPVARIANT_TO_STRING(variant).utf8length); -#else - stringArg.append(NPVARIANT_TO_STRING(variant).UTF8Characters, NPVARIANT_TO_STRING(variant).UTF8Length); -#endif + stringArg = IcedTeaPluginUtilities::NPVariantAsString(variant); } else if (NPVARIANT_IS_OBJECT(variant)) { |