From 9ebeefec85ee1ce784361242694e224b8847be35 Mon Sep 17 00:00:00 2001
From: Peter Teichman <pteichman@litl.com>
Date: Mon, 13 Jul 2009 15:46:24 +0000
Subject: First pass at a port to xulrunner 1.9.1 (Firefox 3.5)

---
diff --git a/browser-plugin/glue.cpp b/browser-plugin/glue.cpp
index 0b989d4..e0a72ab 100644
--- a/browser-plugin/glue.cpp
+++ b/browser-plugin/glue.cpp
@@ -118,19 +118,19 @@ NP_Initialize (NPNetscapeFuncs *aNPNFuncs, NPPluginFuncs *aNPPFuncs)
 
 	aNPPFuncs->size = sizeof (NPPluginFuncs);
 	aNPPFuncs->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
-	aNPPFuncs->newp = NewNPP_NewProc (NPP_New);
-	aNPPFuncs->getvalue = NewNPP_GetValueProc (NPP_GetValue);
-	aNPPFuncs->setvalue = NewNPP_SetValueProc (NPP_SetValue);
-	aNPPFuncs->setwindow = NewNPP_SetWindowProc (NPP_SetWindow);
-	aNPPFuncs->destroy = NewNPP_DestroyProc (NPP_Destroy);
-	aNPPFuncs->newstream = NewNPP_NewStreamProc (NPP_NewStream);
-	aNPPFuncs->destroystream = NewNPP_DestroyStreamProc (NPP_DestroyStream);
-	aNPPFuncs->asfile = NewNPP_StreamAsFileProc (NPP_StreamAsFile);
-	aNPPFuncs->writeready = NewNPP_WriteReadyProc (NPP_WriteReady);
-	aNPPFuncs->write = NewNPP_WriteProc (NPP_Write);
-	aNPPFuncs->print = NewNPP_PrintProc (NPP_Print);
-	aNPPFuncs->event = NewNPP_HandleEventProc (NPP_HandleEvent);
-	aNPPFuncs->urlnotify = NewNPP_URLNotifyProc (NPP_URLNotify);
+	aNPPFuncs->newp = NPP_New;
+	aNPPFuncs->getvalue = NPP_GetValue;
+	aNPPFuncs->setvalue = NPP_SetValue;
+	aNPPFuncs->setwindow = NPP_SetWindow;
+	aNPPFuncs->destroy = NPP_Destroy;
+	aNPPFuncs->newstream = NPP_NewStream;
+	aNPPFuncs->destroystream = NPP_DestroyStream;
+	aNPPFuncs->asfile = NPP_StreamAsFile;
+	aNPPFuncs->writeready = NPP_WriteReady;
+	aNPPFuncs->write = NPP_Write;
+	aNPPFuncs->print = NPP_Print;
+	aNPPFuncs->event = NPP_HandleEvent;
+	aNPPFuncs->urlnotify = NPP_URLNotify;
 
 	return NPERR_NO_ERROR;
 }
@@ -356,12 +356,12 @@ void NPN_ReloadPlugins (NPBool reloadPages)
 
 JRIEnv* NPN_GetJavaEnv (void)
 {
-	return NPNFuncs.getJavaEnv ();
+	return (JRIEnv *)NPNFuncs.getJavaEnv ();
 }
 
 jref NPN_GetJavaPeer (NPP instance)
 {
-	return NPNFuncs.getJavaPeer (instance);
+	return (jref)NPNFuncs.getJavaPeer (instance);
 }
 
 NPError NPN_GetValue (NPP instance, NPNVariable variable, void *value)
diff --git a/browser-plugin/plugin.h b/browser-plugin/plugin.h
index 3f4ba03..75b60ee 100644
--- a/browser-plugin/plugin.h
+++ b/browser-plugin/plugin.h
@@ -22,7 +22,7 @@
 #define __PLUGIN_H__
 
 #include <npapi.h>
-#include <npupp.h>
+#include <npfunctions.h>
 
 #include "evince-view.h"
 
diff --git a/browser-plugin/scriptable.h b/browser-plugin/scriptable.h
index 8ab0917..01912fa 100644
--- a/browser-plugin/scriptable.h
+++ b/browser-plugin/scriptable.h
@@ -22,7 +22,7 @@
 #define __SCRIPTABLE_PLUGIN_H__
 
 #include <npapi.h>
-#include <npupp.h>
+#include <npfunctions.h>
 
 NPObject *AllocateScriptablePluginObject (NPP npp, NPClass *aClass);
 NPObject *AllocateConstructablePluginObject (NPP npp, NPClass *aClass);
--
cgit v0.9.1