From 59abf0a39fd3da1aed2843dba7bb73aa45bb471f Mon Sep 17 00:00:00 2001 From: Ahmad Samir <ahmad@mageia.org> Date: Mon, 6 Jun 2011 22:02:30 +0200 Subject: [PATCH] Rediff the xulrunner patch (originally created by Colin Guthrie) --- projects/mozilla/support/npunix.cpp | 14 +++++++++----- projects/mozilla/vlcshell.cpp | 2 +- projects/mozilla/vlcshell.h | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/projects/mozilla/support/npunix.cpp b/projects/mozilla/support/npunix.cpp index 31515f9..17e3347 100644 --- a/projects/mozilla/support/npunix.cpp +++ b/projects/mozilla/support/npunix.cpp @@ -277,7 +277,7 @@ void NPN_ReloadPlugins(NPBool reloadPages) #endif } -#ifdef OJI +#ifdef OJI_OLD JRIEnv* NPN_GetJavaEnv() { #if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) @@ -636,7 +636,7 @@ void Private_URLNotify(NPP instance, const char* url, void Private_Print(NPP instance, NPPrint* platformPrint); NPError Private_GetValue(NPP instance, NPPVariable variable, void *r_value); NPError Private_SetValue(NPP instance, NPNVariable variable, void *r_value); -#ifdef OJI +#ifdef OJI_OLD JRIGlobalRef Private_GetJavaClass(void); #endif @@ -742,7 +742,7 @@ Private_SetValue(NPP instance, NPNVariable variable, void *r_value) return NPP_SetValue(instance, variable, r_value); } -#ifdef OJI +#ifdef OJI_OLD JRIGlobalRef Private_GetJavaClass(void) { @@ -767,11 +767,13 @@ Private_GetJavaClass(void) * - Netscape uses the return value to identify when an object instance * of this plugin should be created. */ +/* char * NP_GetMIMEDescription(void) { return NPP_GetMIMEDescription(); } +*/ /* * NP_GetValue [optional] @@ -859,7 +861,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) gNetscapeFuncs.pluginthreadasynccall = nsTable->pluginthreadasynccall; #endif -#ifdef OJI +#ifdef OJI_OLD if( minor >= NPVERS_HAS_LIVECONNECT ) { gNetscapeFuncs.getJavaEnv = nsTable->getJavaEnv; @@ -982,7 +984,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) pluginFuncs->urlnotify = (NPP_URLNotifyProcPtr)(Private_URLNotify); #endif } -#ifdef OJI +#ifdef OJI_OLD if( minor >= NPVERS_HAS_LIVECONNECT ) pluginFuncs->javaClass = Private_GetJavaClass(); else @@ -1004,6 +1006,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) * the last object of this kind has been destroyed. * */ +/* NPError NP_Shutdown(void) { @@ -1011,3 +1014,4 @@ NP_Shutdown(void) NPP_Shutdown(); return NPERR_NO_ERROR; } +*/ diff --git a/projects/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp index 49f7d16..4305661 100644 --- a/projects/mozilla/vlcshell.cpp +++ b/projects/mozilla/vlcshell.cpp @@ -270,7 +270,7 @@ NPError NPP_Initialize( void ) } #ifdef OJI -jref NPP_GetJavaClass( void ) +void* NPP_GetJavaClass( void ) { return NULL; } diff --git a/projects/mozilla/vlcshell.h b/projects/mozilla/vlcshell.h index f7444eb..5f09135 100644 --- a/projects/mozilla/vlcshell.h +++ b/projects/mozilla/vlcshell.h @@ -29,7 +29,7 @@ char * NPP_GetMIMEDescription( void ); NPError NPP_Initialize( void ); #ifdef OJI -jref NPP_GetJavaClass( void ); +void* NPP_GetJavaClass( void ); #endif void NPP_Shutdown( void ); -- 1.7.4.4