--- icedtea6-1.8.4/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc.orig	2011-01-21 17:14:38.617974001 -0200
+++ icedtea6-1.8.4/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc	2011-01-21 17:19:41.414973957 -0200
@@ -65,7 +65,7 @@ JavaRequestProcessor::newMessageOnBus(co
 	IcedTeaPluginUtilities::printStringPtrVector("JavaRequest::newMessageOnBus:", message_parts);
 
 	if (*(message_parts->at(0)) == "context" && *(message_parts->at(2)) == "reference")
-		if (atoi(message_parts->at(1)->c_str()) == this->instance && atoi(message_parts->at(3)->c_str()) == this->reference)
+		if (atol(message_parts->at(1)->c_str()) == this->instance && atol(message_parts->at(3)->c_str()) == this->reference)
 		{
 			// Gather the results
 
@@ -116,7 +116,7 @@ JavaRequestProcessor::newMessageOnBus(co
 			           !message_parts->at(4)->find("IsInstanceOf") ||
 			           !message_parts->at(4)->find("NewArray"))
 			{
-				result->return_identifier = atoi(message_parts->at(5)->c_str());
+				result->return_identifier = atol(message_parts->at(5)->c_str());
 				result->return_string->append(*(message_parts->at(5))); // store it as a string as well, for easy access
 				result_ready = true;
 			}  else if (!message_parts->at(4)->find("DeleteLocalRef") ||
@@ -143,7 +143,7 @@ JavaRequestProcessor::newMessageOnBus(co
 			    {
                     // Else it is a complex object
 
-			        result->return_identifier = atoi(message_parts->at(5)->c_str());
+			        result->return_identifier = atol(message_parts->at(5)->c_str());
 			        result->return_string->append(*(message_parts->at(5))); // store it as a string as well, for easy access
 			    }
 
--- icedtea6-1.8.4/plugin/icedteanp/IcedTeaJavaRequestProcessor.h.orig	2011-01-21 17:21:16.179973999 -0200
+++ icedtea6-1.8.4/plugin/icedteanp/IcedTeaJavaRequestProcessor.h	2011-01-21 17:21:20.750974047 -0200
@@ -78,8 +78,8 @@ class JavaRequestProcessor : BusSubscrib
     private:
     	// instance and references are constant throughout this objects
     	// lifecycle
-    	int instance;
-    	int reference;
+    	long instance;
+    	long reference;
     	bool result_ready;
     	JavaResultData* result;
 
--- icedtea6-1.8.4/plugin/icedteanp/IcedTeaNPPlugin.cc.orig	2011-01-21 17:14:23.033973999 -0200
+++ icedtea6-1.8.4/plugin/icedteanp/IcedTeaNPPlugin.cc	2011-01-21 17:19:28.365974076 -0200
@@ -1148,7 +1148,7 @@ void consume_message(gchar* message) {
       gchar** parts = g_strsplit (message, " ", -1);
       guint parts_sz = g_strv_length (parts);
 
-      int instance_id = atoi(parts[1]);
+      long instance_id = atol(parts[1]);
       NPP instance = (NPP) g_hash_table_lookup(id_to_instance_map,
                                          GINT_TO_POINTER(instance_id));
 
--- icedtea6-1.8.4/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc.orig	2011-01-21 17:14:49.416974001 -0200
+++ icedtea6-1.8.4/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	2011-01-21 17:20:00.827973618 -0200
@@ -153,16 +153,16 @@ PluginRequestProcessor::sendWindow(std::
 {
     std::string* type;
     std::string* command;
-    int reference;
+    long reference;
     std::string response = std::string();
     std::string window_ptr_str = std::string();
     NPVariant* variant = new NPVariant();
     static NPObject* window_ptr;
-    int id;
+    long id;
 
     type = message_parts->at(0);
-    id = atoi(message_parts->at(1)->c_str());
-    reference = atoi(message_parts->at(3)->c_str());
+    id = atol(message_parts->at(1)->c_str());
+    reference = atol(message_parts->at(3)->c_str());
     command = message_parts->at(4);
 
     NPP instance;
@@ -202,12 +202,12 @@ PluginRequestProcessor::eval(std::vector
     NPP instance;
     std::string script;
     NPVariant result;
-    int reference;
+    long reference;
     std::string response = std::string();
     std::string return_type = std::string();
-    int id;
+    long id;
 
-    reference = atoi(message_parts->at(3)->c_str());
+    reference = atol(message_parts->at(3)->c_str());
     window_ptr = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(message_parts->at(5));
     instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(window_ptr);
 
@@ -262,7 +262,7 @@ PluginRequestProcessor::call(std::vector
     NPP instance;
     std::string* window_ptr_str;
     NPVariant* window_ptr;
-    int reference;
+    long reference;
     std::string window_function_name;
     std::vector<NPVariant> args = std::vector<NPVariant>();
     std::vector<std::string> arg_ids = std::vector<std::string>();
@@ -271,7 +271,7 @@ PluginRequestProcessor::call(std::vector
     JavaRequestProcessor java_request = JavaRequestProcessor();
     JavaResultData* java_result;
 
-    reference = atoi(message_parts->at(3)->c_str());
+    reference = atol(message_parts->at(3)->c_str());
 
     // window
     window_ptr_str = message_parts->at(5);
@@ -367,10 +367,10 @@ PluginRequestProcessor::sendString(std::
     NPVariant* variant;
     JavaRequestProcessor java_request = JavaRequestProcessor();
     JavaResultData* java_result;
-    int reference;
+    long reference;
     std::string response = std::string();
 
-    reference = atoi(message_parts->at(3)->c_str());
+    reference = atol(message_parts->at(3)->c_str());
     variant_ptr = *(message_parts->at(5));
 
     variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(variant_ptr);
@@ -423,7 +423,7 @@ PluginRequestProcessor::setMember(std::v
     std::string propertyNameID;
     std::string value = std::string();
     std::string response = std::string();
-    int reference;
+    long reference;
 
     NPP instance;
     NPVariant* member;
@@ -434,7 +434,7 @@ PluginRequestProcessor::setMember(std::v
 
     IcedTeaPluginUtilities::printStringPtrVector("PluginRequestProcessor::_setMember - ", message_parts);
 
-    reference = atoi(message_parts->at(3)->c_str());
+    reference = atol(message_parts->at(3)->c_str());
 
     member = (NPVariant*) (IcedTeaPluginUtilities::stringToJSID(*(message_parts->at(5))));
     propertyNameID = *(message_parts->at(6));
@@ -453,7 +453,7 @@ PluginRequestProcessor::setMember(std::v
 
     if (*(message_parts->at(4)) == "SetSlot")
     {
-        property_identifier = browser_functions.getintidentifier(atoi(message_parts->at(6)->c_str()));
+        property_identifier = browser_functions.getintidentifier(atol(message_parts->at(6)->c_str()));
     } else
     {
         java_result = java_request.getString(propertyNameID);
@@ -534,23 +534,23 @@ PluginRequestProcessor::sendMember(std::
     NPIdentifier member_identifier;
 
     int method_id;
-    int instance_id;
-    int reference;
+    long instance_id;
+    long reference;
 
     // debug printout of parent thread data
     IcedTeaPluginUtilities::printStringPtrVector("PluginRequestProcessor::getMember:", message_parts);
 
-    reference = atoi(message_parts->at(3)->c_str());
+    reference = atol(message_parts->at(3)->c_str());
 
     // store info in local variables for easy access
-    instance_id = atoi(message_parts->at(1)->c_str());
+    instance_id = atol(message_parts->at(1)->c_str());
     parent_ptr = (NPVariant*) (IcedTeaPluginUtilities::stringToJSID(message_parts->at(5)));
     member_id.append(*(message_parts->at(6)));
 
     /** Request data from Java if necessary **/
     if (*(message_parts->at(4)) == "GetSlot")
     {
-        member_identifier = browser_functions.getintidentifier(atoi(member_id.c_str()));
+        member_identifier = browser_functions.getintidentifier(atol(member_id.c_str()));
     } else
     {
         // make a new request for getString, to get the name of the identifier
@@ -669,16 +669,16 @@ PluginRequestProcessor::finalize(std::ve
 {
     std::string* type;
     std::string* command;
-    int reference;
+    long reference;
     std::string response = std::string();
     std::string* variant_ptr_str;
     NPVariant* variant_ptr;
     NPObject* window_ptr;
-    int id;
+    long id;
 
     type = message_parts->at(0);
-    id = atoi(message_parts->at(1)->c_str());
-    reference = atoi(message_parts->at(3)->c_str());
+    id = atol(message_parts->at(1)->c_str());
+    reference = atol(message_parts->at(3)->c_str());
     variant_ptr_str = message_parts->at(5);
 
     NPP instance;
--- icedtea6-1.8.4/plugin/icedteanp/IcedTeaScriptablePluginObject.cc.orig	2011-01-21 17:12:13.785973975 -0200
+++ icedtea6-1.8.4/plugin/icedteanp/IcedTeaScriptablePluginObject.cc	2011-01-21 17:19:47.919973900 -0200
@@ -685,7 +685,7 @@ IcedTeaScriptableJavaObject::getProperty
                 return false;
             }
 
-            int length = atoi(java_result->return_string->c_str());
+            long length = atol(java_result->return_string->c_str());
 
             // Access beyond size?
             if (browser_functions.intfromidentifier(name) >= length)
@@ -770,7 +770,7 @@ IcedTeaScriptableJavaObject::setProperty
                 return false;
             }
 
-            int length = atoi(java_result->return_string->c_str());
+            long length = atol(java_result->return_string->c_str());
 
             // Access beyond size?
             if (browser_functions.intfromidentifier(name) >= length)