From bb807f7f22198069059c43f040b1cd0d0218fe23 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 8 Jul 2009 10:19:30 +0000 Subject: [PATCH] Yay, it works, on Linux! =) --- direct/src/plugin_npapi/startup.cxx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/direct/src/plugin_npapi/startup.cxx b/direct/src/plugin_npapi/startup.cxx index 5478b342ea..27029e3354 100644 --- a/direct/src/plugin_npapi/startup.cxx +++ b/direct/src/plugin_npapi/startup.cxx @@ -116,7 +116,7 @@ NP_GetValue(void*, NPPVariable variable, void* value) { NPError OSCALL NP_Initialize(NPNetscapeFuncs *browserFuncs) #else -// On Unix/Mac, the API specifies this second parameter is included, +// On Mac, the API specifies this second parameter is included, // but it lies. We actually don't get a second parameter there, // but we have to put it here to make the compiler happy. NPError OSCALL @@ -132,6 +132,14 @@ NP_Initialize(NPNetscapeFuncs *browserFuncs, logfile << "browserFuncs = " << browserFuncs << "\n" << flush; + // On Unix, we have to use the pluginFuncs argument + // to pass our entry points. +#if !defined(_WIN32) && !defined(__APPLE__) + if (pluginFuncs != NULL) { + NP_GetEntryPoints(pluginFuncs); + } +#endif + return NPERR_NO_ERROR; }