Fix sparkle. Again. No, undefined macros are not fun when #ifed.

admin/mac/Info.plist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -29,7 +29,7 @@
 	<key>SUPublicDSAKeyFile</key>
 	<string>sparkle_pub.pem</string>
 	<key>SUEnableSystemProfiling</key>
-    <string>YES</string>
+	<true/>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

admin/mac/build-release-osx.sh

@@ -39,6 +39,8 @@ VERSION=$1
     mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns
     cp $ROOT/../admin/mac/qt.conf Contents/Resources/qt.conf
 
+    header "Copying Sparkle framework"
+    cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
 
     header "Creating DMG"
     cd ..

src/mac/tomahawkapp_mac.mm

@@ -20,6 +20,7 @@
 
 #include "macdelegate.h"
 #include "macshortcuthandler.h"
+#include "config.h"
 
 #import <AppKit/NSApplication.h>
 #import <Foundation/NSAutoreleasePool.h>

thirdparty/libportfwd/src/portfwd.cpp

@@ -113,7 +113,7 @@ Portfwd::get_status()
 //    Q_ASSERT(urls->controlURL_CIF != NULL);
     // get connection speed
     UPNP_GetLinkLayerMaxBitRates(
-        urls->controlURL_CIF, data->CIF.servicetype, &m_downbps, &m_upbps);
+        urls->controlURL_CIF, data->first.servicetype, &m_downbps, &m_upbps);
 
     // get external IP adress
     char ip[16];