diff options
author | Oystein Eftevaag | 2011-08-02 21:00:57 -0400 |
---|---|---|
committer | Oystein Eftevaag | 2011-08-02 21:00:57 -0400 |
commit | 7e7e6069193fead17d0865d252400b6826805ffc (patch) | |
tree | 363ba1268a4724f7039d4ce2d53a3192c307a67f /backends/updates/macosx | |
parent | 9044e17499797ef007c9c8240d79f69382f61765 (diff) | |
download | scummvm-rg350-7e7e6069193fead17d0865d252400b6826805ffc.tar.gz scummvm-rg350-7e7e6069193fead17d0865d252400b6826805ffc.tar.bz2 scummvm-rg350-7e7e6069193fead17d0865d252400b6826805ffc.zip |
MACOSX: Turned update support off by default, simplified and cleaned the pull request
Diffstat (limited to 'backends/updates/macosx')
-rw-r--r-- | backends/updates/macosx/macosx-updates.h | 6 | ||||
-rw-r--r-- | backends/updates/macosx/macosx-updates.mm | 34 |
2 files changed, 20 insertions, 20 deletions
diff --git a/backends/updates/macosx/macosx-updates.h b/backends/updates/macosx/macosx-updates.h index 1fe0e4bb75..8c9ac1f743 100644 --- a/backends/updates/macosx/macosx-updates.h +++ b/backends/updates/macosx/macosx-updates.h @@ -23,11 +23,13 @@ #ifndef BACKENDS_UPDATES_MACOSX_H #define BACKENDS_UPDATES_MACOSX_H -#include "backends/updates/sparkle-updates.h" +#include "common/scummsys.h" #if defined(MACOSX) && defined(USE_SPARKLE) -class MacOSXUpdateManager : public SparkleUpdateManager { +#include "common/updates.h" + +class MacOSXUpdateManager : public Common::UpdateManager { public: MacOSXUpdateManager(); virtual ~MacOSXUpdateManager(); diff --git a/backends/updates/macosx/macosx-updates.mm b/backends/updates/macosx/macosx-updates.mm index f3675f9bd2..741e89891c 100644 --- a/backends/updates/macosx/macosx-updates.mm +++ b/backends/updates/macosx/macosx-updates.mm @@ -23,11 +23,9 @@ // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL -#include "backends/updates/sparkle-updates.h" - -#if defined(MACOSX) && defined(USE_SPARKLE) - #include "backends/updates/macosx/macosx-updates.h" + +#ifdef USE_SPARKLE #include "common/translation.h" #include <Cocoa/Cocoa.h> @@ -53,8 +51,12 @@ MacOSXUpdateManager::MacOSXUpdateManager() { // Init Sparkle sparkleUpdater = [SUUpdater sharedUpdater]; + NSBundle* mainBundle = [NSBundle mainBundle]; + + NSString* feedbackURL = [mainBundle objectForInfoDictionaryKey:@"SUFeedURL"]; + // Set appcast URL - [sparkleUpdater setFeedURL:[NSURL URLWithString:[NSString stringWithCString:getAppcastUrl().c_str()]]]; + [sparkleUpdater setFeedURL:[NSURL URLWithString:feedbackURL]]; // Get current encoding NSStringEncoding stringEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef)[NSString stringWithCString:(TransMan.getCurrentCharset()).c_str() encoding:NSASCIIStringEncoding])); @@ -108,22 +110,18 @@ Common::UpdateManager::UpdateInterval MacOSXUpdateManager::getUpdateCheckInterva // This is kind of a hack but necessary, as the value stored by Sparkle // might have been changed outside of ScummVM (in which case we return the // default interval of one day) - switch ((UpdateInterval)[sparkleUpdater updateCheckInterval]) { - default: - break; - - case kUpdateIntervalOneDay: - return kUpdateIntervalOneDay; - case kUpdateIntervalOneWeek: - return kUpdateIntervalOneWeek; + UpdateInterval updateInterval = (UpdateInterval)[sparkleUpdater updateCheckInterval]; + switch (updateInterval) { + case kUpdateIntervalOneDay: + case kUpdateIntervalOneWeek: + case kUpdateIntervalOneMonth: + return updateInterval; - case kUpdateIntervalOneMonth: - return kUpdateIntervalOneMonth; + default: + // Return the default value (one day) + return kUpdateIntervalOneDay; } - - // Return the default value (one day) - return kUpdateIntervalOneDay; } #endif |