* remove/disable the update-checker on OSX until 0.8.4 is out

Makefile.am

@@ -609,8 +609,6 @@ VLC-release.app: vlc
 	    extended.m \
 	    bookmarks.h \
 	    bookmarks.m \
-	    update.h \
-	    update.m \
 	    vout.m; do \
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -725,8 +723,6 @@ VLC.app: vlc
 	    extended.m \
 	    bookmarks.h \
 	    bookmarks.m \
-	    update.h \
-	    update.m \
 	    vout.m; do \
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \

extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib

@@ -93,7 +93,6 @@
         }, 
         {
             ACTIONS = {
-                checkForUpdate = id; 
                 clearRecentItems = id; 
                 closeError = id; 
                 intfOpenDisc = id; 
@@ -151,7 +150,6 @@
                 "o_mi_bwd" = id; 
                 "o_mi_channels" = id; 
                 "o_mi_chapter" = id; 
-                "o_mi_checkForUpdate" = id; 
                 "o_mi_clear" = id; 
                 "o_mi_close_window" = id; 
                 "o_mi_controller" = id; 

extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib

@@ -21,9 +21,9 @@
 	<array/>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>2029</integer>
-		<integer>21</integer>
 		<integer>29</integer>
+		<integer>21</integer>
+		<integer>2029</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8C46</string>

extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib

-{
-    IBClasses = (
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            ACTIONS = {cancel = id; download = id; okay = id; }; 
-            CLASS = VLCUpdate; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                "o_bar_checking" = id; 
-                "o_bar_progress" = id; 
-                "o_btn_DownloadNow" = id; 
-                "o_btn_cancel" = id; 
-                "o_btn_okay" = id; 
-                "o_fld_currentVersion" = id; 
-                "o_fld_dest" = id; 
-                "o_fld_elpTime" = id; 
-                "o_fld_releaseNote" = id; 
-                "o_fld_remTime" = id; 
-                "o_fld_size" = id; 
-                "o_fld_source" = id; 
-                "o_fld_userVersion" = id; 
-                "o_lbl_checkForUpdate" = id; 
-                "o_lbl_currentVersion" = id; 
-                "o_lbl_mirror" = id; 
-                "o_lbl_size" = id; 
-                "o_lbl_userVersion" = id; 
-                "o_pop_mirror" = id; 
-                "o_progress_window" = id; 
-                "o_update_window" = id; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file

extras/MacOSX/Resources/English.lproj/Update.nib/info.nib

-<?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">
-<plist version="1.0">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>69 67 356 240 0 0 1440 878 </string>
-	<key>IBFramework Version</key>
-	<string>437.0</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>7</integer>
-		<integer>5</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>8C46</string>
-</dict>
-</plist>

extras/MacOSX/vlc.pbproj/project.pbxproj

@@ -827,7 +827,6 @@
 				DCFCCDB9085CE18F001E36AF,
 				DC7F46ED08A183FC0027DB24,
 				DCE7BD0508A56C8B007B10AE,
-				DCF49B4308B50FAF007E304F,
 			);
 			isa = PBXResourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -914,8 +913,6 @@
 				DC7F46F108A187F60027DB24,
 				DCE7BD0708A5724D007B10AE,
 				DCE7BD0608A5724D007B10AE,
-				DCF49B4408B51992007E304F,
-				DCF49B4508B51992007E304F,
 			);
 			isa = PBXGroup;
 			name = Classes;
@@ -2372,55 +2369,12 @@
 				DCFCCDB7085CE18F001E36AF,
 				DC7F46EB08A183FC0027DB24,
 				DCE7BD0308A56C8B007B10AE,
-				DCF49B4108B50FAF007E304F,
 			);
 			isa = PBXGroup;
 			name = nibs;
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCF49B4108B50FAF007E304F = {
-			children = (
-				DCF49B4208B50FAF007E304F,
-			);
-			isa = PBXVariantGroup;
-			name = Update.nib;
-			path = "";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCF49B4208B50FAF007E304F = {
-			isa = PBXFileReference;
-			lastKnownFileType = wrapper.nib;
-			name = English;
-			path = Resources/English.lproj/Update.nib;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCF49B4308B50FAF007E304F = {
-			fileRef = DCF49B4108B50FAF007E304F;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCF49B4408B51992007E304F = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			name = update.h;
-			path = ../../modules/gui/macosx/update.h;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		DCF49B4508B51992007E304F = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.objc;
-			name = update.m;
-			path = ../../modules/gui/macosx/update.m;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
 		DCFCCDB7085CE18F001E36AF = {
 			children = (
 				DCFCCDB8085CE18F001E36AF,

modules/gui/macosx/Modules.am

@@ -34,7 +34,5 @@ SOURCES_macosx = \
 	extended.m \
 	bookmarks.h \
 	bookmarks.m \
-	update.h \
-	update.m \
 	$(NULL)
 

modules/gui/macosx/intf.h

@@ -93,14 +93,14 @@ struct intf_sys_t
     id o_wizard;                /* VLCWizard      */
     id o_extended;              /* VLCExtended    */
     id o_bookmarks;             /* VLCBookmarks   */
-    id o_update;                /* VLCUpdate      */
+    /*id o_update;                 VLCUpdate      */
     BOOL nib_main_loaded;       /* reference to the main-nib */
     BOOL nib_open_loaded;       /* reference to the open-nib */
     BOOL nib_about_loaded;      /* reference to the about-nib */
     BOOL nib_wizard_loaded;     /* reference to the wizard-nib */
     BOOL nib_extended_loaded;   /* reference to the extended-nib */
     BOOL nib_bookmarks_loaded;  /* reference to the bookmarks-nib */ 
-    BOOL nib_update_loaded;     /* reference to the update-nib */
+    /*BOOL nib_update_loaded;      reference to the update-nib */
 
     IBOutlet id o_window;       /* main window    */
     IBOutlet id o_playlist_view;/* playlist view  */
@@ -149,7 +149,7 @@ struct intf_sys_t
 
     IBOutlet id o_mi_about;
     IBOutlet id o_mi_prefs;
-    IBOutlet id o_mi_checkForUpdate;
+    /*IBOutlet id o_mi_checkForUpdate;*/
     IBOutlet id o_mi_add_intf;
     IBOutlet id o_mu_add_intf;
     IBOutlet id o_mi_services;
@@ -310,7 +310,7 @@ struct intf_sys_t
 
 - (IBAction)viewAbout:(id)sender;
 - (IBAction)viewPreferences:(id)sender;
-- (IBAction)checkForUpdate:(id)sender;
+/*- (IBAction)checkForUpdate:(id)sender;*/
 - (IBAction)closeError:(id)sender;
 - (IBAction)openReadMe:(id)sender;
 - (IBAction)openDocumentation:(id)sender;

modules/gui/macosx/intf.m

@@ -41,7 +41,7 @@
 #include "wizard.h"
 #include "extended.h"
 #include "bookmarks.h"
-#include "update.h"
+/*#include "update.h"*/
 
 /*****************************************************************************
  * Local prototypes.
@@ -303,7 +303,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     o_wizard = [[VLCWizard alloc] init];
     o_extended = [[VLCExtended alloc] init];
     o_bookmarks = [[VLCBookmarks alloc] init];
-    o_update = [[VLCUpdate alloc] init];
+    /*o_update = [[VLCUpdate alloc] init];*/
 
     i_lastShownVolume = -1;
     return _o_sharedMainInstance;
@@ -467,7 +467,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     /* main menu */
     [o_mi_about setTitle: [_NS("About VLC media player") \
         stringByAppendingString: @"..."]];
-    [o_mi_checkForUpdate setTitle: _NS("Check for Update...")];
+/*    [o_mi_checkForUpdate setTitle: _NS("Check for Update...")];*/
     [o_mi_prefs setTitle: _NS("Preferences...")];
     [o_mi_add_intf setTitle: _NS("Add Interface")];
     [o_mu_add_intf setTitle: _NS("Add Interface")];
@@ -1541,7 +1541,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_prefs showPrefs];
 }
 
-- (IBAction)checkForUpdate:(id)sender
+/*- (IBAction)checkForUpdate:(id)sender
 {
     if (!nib_update_loaded)
     {
@@ -1550,7 +1550,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     } else {
         [o_update showUpdateWindow];
     }
-}
+}*/
 
 - (IBAction)closeError:(id)sender
 {

modules/gui/macosx/open.m

@@ -81,7 +81,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     p_list = [NSMutableArray arrayWithCapacity: 1];
     
     next_media = IOIteratorNext( media_iterator );
-    if( next_media != NULL )
+    if( next_media != nil )
     {
         char psz_buf[0x32];
         size_t dev_path_length;
@@ -114,7 +114,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
             
             IOObjectRelease( next_media );
         
-        } while( ( next_media = IOIteratorNext( media_iterator ) ) != NULL );
+        } while( ( next_media = IOIteratorNext( media_iterator ) ) != nil );
     }
     
     IOObjectRelease( media_iterator );

modules/gui/macosx/prefs.h

@@ -60,6 +60,7 @@
     
     IBOutlet id o_prefs_window;
     IBOutlet id o_title;
+    IBOutlet id o_help;
     IBOutlet id o_tree;
     IBOutlet id o_prefs_view;
     IBOutlet id o_save_btn;

modules/gui/macosx/prefs.m

@@ -106,6 +106,11 @@ static VLCPrefs *_o_sharedMainInstance = nil;
     [o_title setStringValue: o_title_name];
 }
 
+- (void)setHelp: (NSString *) o_help_name
+{
+    [o_help setStringValue: o_help_name];
+}
+
 - (void)showPrefs
 {
     /* load our nib (if not already loaded) */
@@ -508,6 +513,7 @@ static VLCTreeItem *o_root_item = nil;
     NSView          *o_view;
 
     [[VLCPrefs sharedInstance] setTitle: [self getTitle]];
+    [[VLCPrefs sharedInstance] setHelp: [self getHelp]];
     /* NSLog( [self getHelp] ); */ 
     s_vrc = [[o_prefs_view contentView] bounds]; s_vrc.size.height -= 4;
     o_view = [[VLCFlippedView alloc] initWithFrame: s_vrc];

modules/gui/macosx/update.h

-/*****************************************************************************
- * update.h: MacOS X Check-For-Update window
- *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
- * $Id$
- *
- * Authors: Felix Khne <fkuehne@users.sf.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-@interface VLCUpdate : NSObject
-{
-    IBOutlet id o_bar_progress;
-    IBOutlet id o_btn_cancel;
-    IBOutlet id o_btn_DownloadNow;
-    IBOutlet id o_btn_okay;
-    IBOutlet id o_fld_currentVersion;
-    IBOutlet id o_fld_dest;
-    IBOutlet id o_fld_elpTime;
-    IBOutlet id o_fld_releaseNote;
-    IBOutlet id o_fld_remTime;
-    IBOutlet id o_fld_size;
-    IBOutlet id o_fld_source;
-    IBOutlet id o_fld_userVersion;
-    IBOutlet id o_lbl_currentVersion;
-    IBOutlet id o_lbl_mirror;
-    IBOutlet id o_lbl_size;
-    IBOutlet id o_lbl_userVersion;
-    IBOutlet id o_pop_mirror;
-    IBOutlet id o_progress_window;
-    IBOutlet id o_update_window;
-    IBOutlet id o_bar_checking;
-    IBOutlet id o_lbl_checkForUpdate;
-    
-    NSMutableArray * o_mirrors;
-    NSMutableDictionary * o_files;
-}
-
-
-- (IBAction)cancel:(id)sender;
-- (IBAction)download:(id)sender;
-- (IBAction)okay:(id)sender;
-
-- (void)showUpdateWindow;
-- (void)initStrings;
-- (void)getData;
-
-+ (VLCUpdate *)sharedInstance;
-
-@end