diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mumble/Overlay_macx.mm | 5 | ||||
| -rw-r--r-- | src/mumble/mumble.plist | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/mumble/Overlay_macx.mm b/src/mumble/Overlay_macx.mm index c6c579419..c74e59735 100644 --- a/src/mumble/Overlay_macx.mm +++ b/src/mumble/Overlay_macx.mm @@ -191,14 +191,13 @@ bool Overlay::installFiles() { OSStatus err; // Get the tarball that we should install. - NSString *tarballPath = [NSString stringWithFormat:@"%@/%@", [[NSBundle mainBundle] bundlePath], - [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MumbleOverlayInstallPayload"]]; + NSString *tarballPath = [[NSBundle mainBundle] pathForResource:@"MumbleOverlay" ofType:@"tar.bz2"]; // And the destination we should install it to. NSString *destination = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MumbleOverlayInstallDestination"]; if (! tarballPath || ! destination) { - qWarning("Overlay_macx: Info.plist does not specify installation parameters."); + qWarning("Overlay_macx: Tarball or install destination (in Info.plist) missing."); return false; } diff --git a/src/mumble/mumble.plist b/src/mumble/mumble.plist index ec0d8d45f..07b8df59c 100644 --- a/src/mumble/mumble.plist +++ b/src/mumble/mumble.plist @@ -29,10 +29,6 @@ <string>1.2.3</string> <key>NSHumanReadableCopyright</key> <string>Copyright (c) 2005-2010 Thorvald Natvig <slicer@users.sourceforge.net></string> - <key>MumbleOverlayLibrary</key> - <string>Contents/Overlay/libmumbleoverlay.dylib</string> - <key>MumbleOverlayInstallPayload</key> - <string>Contents/Overlay/MumbleOverlay.tar.bz2</string> <key>MumbleOverlayInstallDestination</key> <string>/Library/ScriptingAdditions/</string> <key>MumbleOverlayLoaderBundle</key> @@ -40,6 +36,6 @@ <key>MumbleOverlayLoaderBundleIdentifier</key> <string>net.sourceforge.mumble.OverlayScriptingAddition</string> <key>MumbleOverlayLoaderRequiredVersion</key> - <integer>1</integer> + <integer>2</integer> </dict> </plist> |