From 443fff604b6f5008d35b5337ae6cc6a706730944 Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 25 Aug 2011 07:35:30 +0000 Subject: [PATCH] fix plugin for Safari 5 lameness --- direct/src/plugin/p3dInstance.cxx | 1 + direct/src/plugin_npapi/ppInstance.cxx | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/direct/src/plugin/p3dInstance.cxx b/direct/src/plugin/p3dInstance.cxx index 5695678739..1f42fd3364 100644 --- a/direct/src/plugin/p3dInstance.cxx +++ b/direct/src/plugin/p3dInstance.cxx @@ -3864,6 +3864,7 @@ add_cocoa_modifier_flags(unsigned int &swb_flags, int modifiers) { //////////////////////////////////////////////////////////////////// void P3DInstance:: send_notify(const string &message) { + nout << "send_notify(" << message << ")\n"; P3D_request *request = new P3D_request; request->_instance = NULL; request->_request_type = P3D_RT_notify; diff --git a/direct/src/plugin_npapi/ppInstance.cxx b/direct/src/plugin_npapi/ppInstance.cxx index a32f4e3731..46d8866095 100644 --- a/direct/src/plugin_npapi/ppInstance.cxx +++ b/direct/src/plugin_npapi/ppInstance.cxx @@ -210,6 +210,12 @@ begin() { set_failed(); return; } +#else + // While Safari 5 on Mac claims to provide this function, it doesn't + // appear to work. (!) So we pretend we never have it on Mac. + // Fortunately, this hack does us no harm because the _request_timer + // hack works fine on OSX. + has_plugin_thread_async_call = false; #endif // __APPLE__ string url = PANDA_PACKAGE_HOST_URL;