From d72aa240b794c81d4ec9aea24158564e696173a9 Mon Sep 17 00:00:00 2001
From: Adam Domurad <adomurad@redhat.com>
Date: Thu, 11 Apr 2013 15:37:32 -0400
Subject: Remove legacy support for the old version of NPAPI

---
 plugin/icedteanp/IcedTeaPluginUtils.cc | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'plugin/icedteanp/IcedTeaPluginUtils.cc')

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;
 }
 
-- 
cgit v1.2.3