diff options
| author | Ingo Bauersachs <ingo@jitsi.org> | 2014-12-06 14:18:38 +0100 |
|---|---|---|
| committer | Ingo Bauersachs <ingo@jitsi.org> | 2014-12-06 14:22:59 +0100 |
| commit | 63effac233bb3dc223bd2a5516ca20d0a86420bd (patch) | |
| tree | 0ec50065a1f7149292f4d67e33ffa082a4829cc9 /src/native | |
| parent | 70c6d3d675a1988ebd420010d1f18496342fb8f0 (diff) | |
| download | jitsi-63effac233bb3dc223bd2a5516ca20d0a86420bd.zip jitsi-63effac233bb3dc223bd2a5516ca20d0a86420bd.tar.gz jitsi-63effac233bb3dc223bd2a5516ca20d0a86420bd.tar.bz2 | |
Rename the Java key to Javax in Jitsi.app's Info.plist
As soon as a dictionary with the name Java is present in Info.plist, OS
X tries to open/install Apple's old Java 6 JVM, regardless of what the
actual native launcher wants to do.
Diffstat (limited to 'src/native')
| -rw-r--r-- | src/native/macosx/launcher/launcher.m | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/native/macosx/launcher/launcher.m b/src/native/macosx/launcher/launcher.m index f090f44..6cc7dbc 100644 --- a/src/native/macosx/launcher/launcher.m +++ b/src/native/macosx/launcher/launcher.m @@ -9,7 +9,8 @@ #import <Cocoa/Cocoa.h> #include <dlfcn.h> -#define JVM_JAVA_KEY "Java" +#define JVM_JAVA_KEY "Javax" // Cannot be Java + // or OSX requests the old Apple JVM #define JVM_WORKING_DIR_KEY "WorkingDirectory" #define JVM_MAIN_CLASS_NAME_KEY "MainClass" #define JVM_CLASSPATH_KEY "ClassPath" |