Removes trailing spaces. Removes tabs.

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

diff --git a/modules/gui/macosx/update.m b/modules/gui/macosx/update.m
index 85abd44a739876c5d084571621bde7276cc74ee3..ef11e12224c5a494b35675b29b7a44c65faf6c88 100644 (file)
--- a/modules/gui/macosx/update.m
+++ b/modules/gui/macosx/update.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * update.m: MacOS X Check-For-Update window
  *****************************************************************************
- * Copyright (C) 2005-2006 the VideoLAN team
+ * Copyright (C) 2005-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Felix K\9fhne <fkuehne@users.sf.net>
@@ -23,8 +23,8 @@
 
 
 /*****************************************************************************
- * Note: the code used to communicate with VLC's core was inspired by 
- * ../wxwidgets/dialogs/updatevlc.cpp, written by Antoine Cellerier. 
+ * Note: the code used to communicate with VLC's core was inspired by
+ * ../wxwidgets/dialogs/updatevlc.cpp, written by Antoine Cellerier.
  *****************************************************************************/
 
 
@@ -52,7 +52,7 @@ static VLCUpdate *_o_sharedInstance = nil;
 
 - (id)init
 {
-    if (_o_sharedInstance) {
+    if( _o_sharedInstance ) {
         [self dealloc];
     } else {
         _o_sharedInstance = [super init];
@@ -68,7 +68,7 @@ static VLCUpdate *_o_sharedInstance = nil;
 
     /* clean the interface */
     [o_fld_releaseNote setString: @""];
-    
+ 
     [self initInterface];
 }
 
@@ -86,8 +86,8 @@ static VLCUpdate *_o_sharedInstance = nil;
     [o_update_window setTitle: _NS("Check for Updates")];
     [o_btn_DownloadNow setTitle: _NS("Download now")];
     [o_btn_okay setTitle: _NS("OK")];
-    [o_chk_updateOnStartup setTitle: _NS("Check for VLC update automatically")];
-    /* we don't use - (BOOL)shouldCheckUpdateOnStartup beccause we don't want the Alert
+    [o_chk_updateOnStartup setTitle: _NS("Automatically check for updates")];
+    /* we don't use - (BOOL)shouldCheckUpdateOnStartup because we don't want the Alert
      * panel to pop up at this time */
     [o_chk_updateOnStartup setState: [[NSUserDefaults standardUserDefaults] boolForKey: kPrefUpdateOnStartup]];
 }
@@ -102,12 +102,12 @@ static VLCUpdate *_o_sharedInstance = nil;
 {
     NSDate *o_last_update;
     NSDate *o_next_update;
-    
-    if(![[NSUserDefaults standardUserDefaults] objectForKey: kPrefUpdateOnStartup])
+ 
+    if( ![[NSUserDefaults standardUserDefaults] objectForKey: kPrefUpdateOnStartup] )
     {
         /* We don't have any preferences stored, ask the user. */
-        int res = NSRunInformationalAlertPanel( _NS("Do you want VLC to check for update automatically?"),
-              _NS("You can change this option later in the VLC update window."), _NS("Yes"), _NS("No"), nil );
+        int res = NSRunInformationalAlertPanel( _NS("Do you want VLC to check for updates automatically?"),
+              _NS("You can change this option in VLC's update window later on."), _NS("Yes"), _NS("No"), nil );
         [self setShouldCheckUpdate: res];
     }
 
@@ -146,7 +146,7 @@ static VLCUpdate *_o_sharedInstance = nil;
     /* provide a save dialogue */
     SEL sel = @selector(getLocationForSaving:returnCode:contextInfo:);
     NSSavePanel * saveFilePanel = [[NSSavePanel alloc] init];
-    
+ 
     [saveFilePanel setRequiredFileType: @"dmg"];
     [saveFilePanel setCanSelectHiddenExtension: YES];
     [saveFilePanel setCanCreateDirectories: YES];
@@ -159,7 +159,7 @@ static VLCUpdate *_o_sharedInstance = nil;
 - (void)getLocationForSaving: (NSSavePanel *)sheet returnCode: \
     (int)returnCode contextInfo: (void *)contextInfo
 {
-    if (returnCode == NSOKButton)
+    if( returnCode == NSOKButton )
     {
         /* perform download and pass the selected path */
         [self performDownload: [sheet filename]];
@@ -199,12 +199,12 @@ static VLCUpdate *_o_sharedInstance = nil;
         p_uit->i_rs = UPDATE_RELEASE_STATUS_NEWER;
         p_uit->i_t = UPDATE_FILE_TYPE_ALL;
         update_iterator_Action( p_uit, UPDATE_MIRROR );
-        
+ 
         while( update_iterator_Action( p_uit, UPDATE_FILE) != UPDATE_FAIL )
         {
             msg_Dbg( p_intf, "parsing available updates, run %i", x );
             /* if the announced item is of the type "binary", keep it and display
-             * its details to the user. Do similar stuff on "info". Do both 
+             * its details to the user. Do similar stuff on "info". Do both
              * only if the file is announced as stable */
             if( p_uit->release.i_type == UPDATE_RELEASE_TYPE_STABLE )
             {
@@ -232,7 +232,7 @@ static VLCUpdate *_o_sharedInstance = nil;
                             "is %s (%i MB to download)."), \
                         p_uit->release.psz_version, ((p_uit->file.l_size \
                         / 1024) / 1024)]];
-                        
+ 
                     if( o_urlOfBinary )
                         [o_urlOfBinary release];
                     o_urlOfBinary = [[NSString alloc] initWithUTF8String: \
@@ -293,14 +293,14 @@ static VLCUpdate *_o_sharedInstance = nil;
             msleep( 500000 );
 
             /* let's open our cached release note and display it
-             * we can't use NSString stringWithContentsOfFile:encoding:error: 
+             * we can't use NSString stringWithContentsOfFile:encoding:error:
              * since it is Tiger only */
             NSString * releaseNote = [[NSString alloc] initWithData: \
                 [NSData dataWithContentsOfFile: pathToReleaseNote] \
                 encoding: NSISOLatin1StringEncoding];
             if( releaseNote )
                 [o_fld_releaseNote setString: releaseNote];
-        
+ 
             /* delete the file since it isn't needed anymore */
             BOOL myBOOL = NO;
             myBOOL = [[NSFileManager defaultManager] removeFileAtPath: \
@@ -310,10 +310,9 @@ static VLCUpdate *_o_sharedInstance = nil;
         {
             /* don't confuse the user, but make her happy */
             [o_fld_status setStringValue: _NS("This version of VLC " \
-                "is latest available.")];
+                "is the latest available.")];
             [o_btn_DownloadNow setEnabled: NO];
             msg_Dbg( p_intf, "current version is up-to-date" );
-            msg_Warn( p_intf, "retrieving current release notes failed!" );
         }
     }
     [pool release];
@@ -341,7 +340,7 @@ static VLCUpdate *_o_sharedInstance = nil;
                 update_download( p_uit, (char *)[path UTF8String] );
             }
         }
-        
+ 
         update_iterator_Delete( p_uit );
     }