From d626601f147835e90b021bd707a9007e9c892700 Mon Sep 17 00:00:00 2001 From: "idk%eng.sun.com" Date: Wed, 26 Jan 2000 04:20:22 +0000 Subject: [PATCH] Removed workaround for 24194 Fixed build probelem (included plstr.h instead of string.h into src/PlugletFactory.cpp) git-svn-id: svn://10.0.0.236/trunk@58728 18797224-902f-48f8-a5cc-f745e15eee43 --- .../jni/org_mozilla_pluglet_mozilla_PlugletPeerImpl.cpp | 8 -------- mozilla/java/plugins/src/PlugletFactory.cpp | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/mozilla/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletPeerImpl.cpp b/mozilla/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletPeerImpl.cpp index c2f694ab2a3..9074ecbc1c4 100644 --- a/mozilla/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletPeerImpl.cpp +++ b/mozilla/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletPeerImpl.cpp @@ -114,14 +114,6 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_newSt */ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_showStatus (JNIEnv *env, jobject jthis, jstring _msg) { - if(1) { //work around for bug 24194 - PR_LOG(PlugletLog::log, PR_LOG_DEBUG, - ("PlugletPeerImpl.showStatus: nsIPluginInstancePeer.ShowStatus crashes browser \n" - "So we skeep calling this method. See bug 24194.\n" - "msg=%s\n", _msg)); - return; - - } nsIPluginInstancePeer * instancePeer = (nsIPluginInstancePeer*)env->GetLongField(jthis, peerFID); if (!instancePeer || !_msg) { diff --git a/mozilla/java/plugins/src/PlugletFactory.cpp b/mozilla/java/plugins/src/PlugletFactory.cpp index 2f0f2b9fcd6..bf0d7af0bdf 100644 --- a/mozilla/java/plugins/src/PlugletFactory.cpp +++ b/mozilla/java/plugins/src/PlugletFactory.cpp @@ -22,7 +22,7 @@ #include "PlugletEngine.h" #include "PlugletLoader.h" #include "Pluglet.h" -#include "string.h" +#include "plstr.h" #include "PlugletLog.h" jmethodID PlugletFactory::createPlugletMID = NULL;