macosx: Use a toolbar to display controls. (Doesn't look like a toolbar though)

[vlc] / modules / gui / macosx / update.m

diff --git a/modules/gui/macosx/update.m b/modules/gui/macosx/update.m
index e201cb26fce40a539d911571b98a106a480677d0..449546b6c69e25d743ce9eddacb24e7b4ca7509b 100644 (file)
--- a/modules/gui/macosx/update.m
+++ b/modules/gui/macosx/update.m
@@ -26,6 +26,8 @@
 
 #ifdef UPDATE_CHECK
 
+#include <assert.h>
+
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
@@ -132,8 +134,10 @@ static VLCUpdate *_o_sharedInstance = nil;
     [saveFilePanel setRequiredFileType: @"dmg"];
     [saveFilePanel setCanSelectHiddenExtension: YES];
     [saveFilePanel setCanCreateDirectories: YES];
+    update_release_t *p_release = update_GetRelease( p_u );
+    assert( p_release );
     [saveFilePanel beginSheetForDirectory:nil file:
-        [[[NSString stringWithUTF8String: p_u->release.psz_url] componentsSeparatedByString:@"/"] lastObject]
+        [[[NSString stringWithUTF8String: p_release->psz_url] componentsSeparatedByString:@"/"] lastObject]
                            modalForWindow: o_update_window 
                             modalDelegate:self
                            didEndSelector:sel
@@ -165,8 +169,6 @@ static VLCUpdate *_o_sharedInstance = nil;
 
 - (void)setUpToDate:(BOOL)uptodate
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
     if( uptodate )
     {
         [o_fld_releaseNote setString: @""];
@@ -176,24 +178,27 @@ static VLCUpdate *_o_sharedInstance = nil;
     }
     else
     {
-        [o_fld_releaseNote setString: [NSString stringWithUTF8String: (p_u->release.psz_desc ? p_u->release.psz_desc : "" )]];
+        update_release_t *p_release = update_GetRelease( p_u );
+        [o_fld_releaseNote setString: [NSString stringWithUTF8String: (p_release->psz_desc ? p_release->psz_desc : "" )]];
         [o_fld_status setStringValue: _NS("This version of VLC is outdated.")];
         [o_fld_currentVersion setStringValue: [NSString stringWithFormat:
-            _NS("The current release is %d.%d.%d%c."), p_u->release.i_major,
-            p_u->release.i_minor, p_u->release.i_revision, p_u->release.extra]];
+            _NS("The current release is %d.%d.%d%c."), p_release->i_major,
+            p_release->i_minor, p_release->i_revision, p_release->extra]];
         [o_btn_DownloadNow setEnabled: YES];
         /* Make sure the update window is showed in case we have something */
         [o_update_window center];
         [o_update_window displayIfNeeded];
         [o_update_window makeKeyAndOrderFront: self];
     }
-
-    [pool release];
 }
 
 static void updateCallback( void * p_data, bool b_success )
 {
-    [(id)p_data setUpToDate: !b_success || !update_NeedUpgrade( ((VLCUpdate*)p_data)->p_u )];
+    VLCUpdate * update = p_data;
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+    NSNumber * state = [NSNumber numberWithBool:!b_success || !update_NeedUpgrade( update->p_u )];
+    [update performSelectorOnMainThread:@selector(setUpToDate:) withObject:state waitUntilDone:YES];
+    [pool release];
 }
 
 - (void)checkForUpdate
@@ -203,7 +208,9 @@ static void updateCallback( void * p_data, bool b_success )
         return;
     update_Check( p_u, updateCallback, self );
 
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
     [[NSUserDefaults standardUserDefaults] setObject: [NSDate date] forKey: kPrefUpdateLastTimeChecked];
+    [pool release];
 }
 
 - (void)performDownload:(NSString *)path