aboutsummaryrefslogtreecommitdiffstats
path: root/plugin/icedteanp/IcedTeaPluginUtils.cc
diff options
context:
space:
mode:
authorAdam Domurad <[email protected]>2013-04-11 15:37:32 -0400
committerAdam Domurad <[email protected]>2013-04-11 15:37:32 -0400
commitd72aa240b794c81d4ec9aea24158564e696173a9 (patch)
treea814a39f675b81dfa3997d565d96f2a19abfa8c3 /plugin/icedteanp/IcedTeaPluginUtils.cc
parent038866be9293d5194b04af3c98c71e5e66712cf2 (diff)
Remove legacy support for the old version of NPAPI
Diffstat (limited to 'plugin/icedteanp/IcedTeaPluginUtils.cc')
-rw-r--r--plugin/icedteanp/IcedTeaPluginUtils.cc10
1 files changed, 0 insertions, 10 deletions
diff --git a/plugin/icedteanp/IcedTeaPluginUtils.cc b/plugin/icedteanp/IcedTeaPluginUtils.cc
index d365b05..6ed17bb 100644
--- a/plugin/icedteanp/IcedTeaPluginUtils.cc
+++ b/plugin/icedteanp/IcedTeaPluginUtils.cc
@@ -920,15 +920,9 @@ IcedTeaPluginUtilities::decodeURL(const gchar* url, gchar** decoded_url)
std::string
IcedTeaPluginUtilities::NPVariantAsString(NPVariant variant)
{
-#if MOZILLA_VERSION_COLLAPSED < 1090200
- return std::string(
- NPVARIANT_TO_STRING(variant).utf8characters,
- NPVARIANT_TO_STRING(variant).utf8length);
-#else
return std::string(
NPVARIANT_TO_STRING(variant).UTF8Characters,
NPVARIANT_TO_STRING(variant).UTF8Length);
-#endif
}
/**
@@ -949,11 +943,7 @@ NPString IcedTeaPluginUtilities::NPStringCopy(const std::string& result) {
NPVariant IcedTeaPluginUtilities::NPVariantStringCopy(const std::string& result) {
NPString npstr = NPStringCopy(result);
NPVariant npvar;
-#if MOZILLA_VERSION_COLLAPSED < 1090200
- STRINGN_TO_NPVARIANT(npstr.utf8characters, npstr.utf8length, npvar);
-#else
STRINGN_TO_NPVARIANT(npstr.UTF8Characters, npstr.UTF8Length, npvar);
-#endif
return npvar;
}