| 1 |
From 59abf0a39fd3da1aed2843dba7bb73aa45bb471f Mon Sep 17 00:00:00 2001 |
| 2 |
From: Ahmad Samir <ahmad@mageia.org> |
| 3 |
Date: Mon, 6 Jun 2011 22:02:30 +0200 |
| 4 |
Subject: [PATCH] Rediff the xulrunner patch (originally created by Colin Guthrie) |
| 5 |
|
| 6 |
--- |
| 7 |
projects/mozilla/support/npunix.cpp | 14 +++++++++----- |
| 8 |
projects/mozilla/vlcshell.cpp | 2 +- |
| 9 |
projects/mozilla/vlcshell.h | 2 +- |
| 10 |
3 files changed, 11 insertions(+), 7 deletions(-) |
| 11 |
|
| 12 |
diff --git a/projects/mozilla/support/npunix.cpp b/projects/mozilla/support/npunix.cpp |
| 13 |
index 31515f9..17e3347 100644 |
| 14 |
--- a/projects/mozilla/support/npunix.cpp |
| 15 |
+++ b/projects/mozilla/support/npunix.cpp |
| 16 |
@@ -277,7 +277,7 @@ void NPN_ReloadPlugins(NPBool reloadPages) |
| 17 |
#endif |
| 18 |
} |
| 19 |
|
| 20 |
-#ifdef OJI |
| 21 |
+#ifdef OJI_OLD |
| 22 |
JRIEnv* NPN_GetJavaEnv() |
| 23 |
{ |
| 24 |
#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) |
| 25 |
@@ -636,7 +636,7 @@ void Private_URLNotify(NPP instance, const char* url, |
| 26 |
void Private_Print(NPP instance, NPPrint* platformPrint); |
| 27 |
NPError Private_GetValue(NPP instance, NPPVariable variable, void *r_value); |
| 28 |
NPError Private_SetValue(NPP instance, NPNVariable variable, void *r_value); |
| 29 |
-#ifdef OJI |
| 30 |
+#ifdef OJI_OLD |
| 31 |
JRIGlobalRef Private_GetJavaClass(void); |
| 32 |
#endif |
| 33 |
|
| 34 |
@@ -742,7 +742,7 @@ Private_SetValue(NPP instance, NPNVariable variable, void *r_value) |
| 35 |
return NPP_SetValue(instance, variable, r_value); |
| 36 |
} |
| 37 |
|
| 38 |
-#ifdef OJI |
| 39 |
+#ifdef OJI_OLD |
| 40 |
JRIGlobalRef |
| 41 |
Private_GetJavaClass(void) |
| 42 |
{ |
| 43 |
@@ -767,11 +767,13 @@ Private_GetJavaClass(void) |
| 44 |
* - Netscape uses the return value to identify when an object instance |
| 45 |
* of this plugin should be created. |
| 46 |
*/ |
| 47 |
+/* |
| 48 |
char * |
| 49 |
NP_GetMIMEDescription(void) |
| 50 |
{ |
| 51 |
return NPP_GetMIMEDescription(); |
| 52 |
} |
| 53 |
+*/ |
| 54 |
|
| 55 |
/* |
| 56 |
* NP_GetValue [optional] |
| 57 |
@@ -859,7 +861,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) |
| 58 |
gNetscapeFuncs.pluginthreadasynccall = |
| 59 |
nsTable->pluginthreadasynccall; |
| 60 |
#endif |
| 61 |
-#ifdef OJI |
| 62 |
+#ifdef OJI_OLD |
| 63 |
if( minor >= NPVERS_HAS_LIVECONNECT ) |
| 64 |
{ |
| 65 |
gNetscapeFuncs.getJavaEnv = nsTable->getJavaEnv; |
| 66 |
@@ -982,7 +984,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) |
| 67 |
pluginFuncs->urlnotify = (NPP_URLNotifyProcPtr)(Private_URLNotify); |
| 68 |
#endif |
| 69 |
} |
| 70 |
-#ifdef OJI |
| 71 |
+#ifdef OJI_OLD |
| 72 |
if( minor >= NPVERS_HAS_LIVECONNECT ) |
| 73 |
pluginFuncs->javaClass = Private_GetJavaClass(); |
| 74 |
else |
| 75 |
@@ -1004,6 +1006,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) |
| 76 |
* the last object of this kind has been destroyed. |
| 77 |
* |
| 78 |
*/ |
| 79 |
+/* |
| 80 |
NPError |
| 81 |
NP_Shutdown(void) |
| 82 |
{ |
| 83 |
@@ -1011,3 +1014,4 @@ NP_Shutdown(void) |
| 84 |
NPP_Shutdown(); |
| 85 |
return NPERR_NO_ERROR; |
| 86 |
} |
| 87 |
+*/ |
| 88 |
diff --git a/projects/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp |
| 89 |
index 49f7d16..4305661 100644 |
| 90 |
--- a/projects/mozilla/vlcshell.cpp |
| 91 |
+++ b/projects/mozilla/vlcshell.cpp |
| 92 |
@@ -270,7 +270,7 @@ NPError NPP_Initialize( void ) |
| 93 |
} |
| 94 |
|
| 95 |
#ifdef OJI |
| 96 |
-jref NPP_GetJavaClass( void ) |
| 97 |
+void* NPP_GetJavaClass( void ) |
| 98 |
{ |
| 99 |
return NULL; |
| 100 |
} |
| 101 |
diff --git a/projects/mozilla/vlcshell.h b/projects/mozilla/vlcshell.h |
| 102 |
index f7444eb..5f09135 100644 |
| 103 |
--- a/projects/mozilla/vlcshell.h |
| 104 |
+++ b/projects/mozilla/vlcshell.h |
| 105 |
@@ -29,7 +29,7 @@ char * NPP_GetMIMEDescription( void ); |
| 106 |
NPError NPP_Initialize( void ); |
| 107 |
|
| 108 |
#ifdef OJI |
| 109 |
-jref NPP_GetJavaClass( void ); |
| 110 |
+void* NPP_GetJavaClass( void ); |
| 111 |
#endif |
| 112 |
void NPP_Shutdown( void ); |
| 113 |
|
| 114 |
-- |
| 115 |
1.7.4.4 |
| 116 |
|
Parent Directory
| 
Revision Log