merge from OJI branch

git-svn-id: svn://10.0.0.236/trunk@2980 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/modules/edtplug/src/edtplugStubs.c

@@ -77,9 +77,11 @@ void EDTPLUG_RegisterEditURLCallback(EditURLCallback callback){
 static JRIEnv* getEnv(MozillaEvent_MozillaCallback* e)
 {
     JRIEnv* ee = e->env;
+#ifdef JAVA     // XXX hack to get OJI working
     if ( ! ee ) {
         ee = JRI_GetCurrentEnv();
     }
+#endif
     return ee;
 }