macosx: backport [23942] as it is save

NEWS

@@ -11,7 +11,8 @@ Security updates:
      - M3U Playlist Demuxer
 
 Mac OS X Interface:
- * Improved Fullscreen behavior on multi-screen setups
+ * Corrected fullscreen behavior on multi-screen setups
+ * Improved behavior of the Preferences window
 
 
 Changes between 0.8.6c and 0.8.6d:

modules/gui/macosx/intf.h

@@ -106,6 +106,7 @@ struct intf_sys_t
     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_prefs_loaded;      /* reference to the prefs-nib */
     BOOL nib_update_loaded;     /* reference to the update-nib */
 
     IBOutlet id o_window;       /* main window    */

modules/gui/macosx/intf.m

@@ -339,7 +339,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     }
 
     o_about = [[VLAboutBox alloc] init];
-    o_prefs = nil;
+    o_prefs = [[VLCPrefs alloc] init];
     o_open = [[VLCOpen alloc] init];
     o_wizard = [[VLCWizard alloc] init];
     o_extended = nil;
@@ -1552,8 +1552,6 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
 {
     playlist_t * p_playlist;
     vout_thread_t * p_vout;
-    
-    msg_Dbg( p_intf, "applicationWillTerminate" );
 
 #define p_input p_intf->p_sys->p_input
     if( p_input )
@@ -1598,6 +1596,9 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
     if( nib_about_loaded && o_about )
         [o_about release];
     
+    if( nib_prefs_loaded && o_prefs )
+        [o_prefs release];
+    
     if( nib_open_loaded && o_open )
         [o_open release];
     
@@ -1772,19 +1773,16 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
 - (IBAction)viewAbout:(id)sender
 {
     if (!nib_about_loaded)
-    {
         nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
-        [o_about showPanel];
-    } else {
-        [o_about showPanel];
-    }
+        
+    [o_about showPanel];
 }
 
 - (IBAction)viewPreferences:(id)sender
 {
-/* GRUIIIIIIIK */
-    if( o_prefs == nil )
-        o_prefs = [[VLCPrefs alloc] init];
+    if (!nib_prefs_loaded)
+        nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner:self];
+
     [o_prefs showPrefs];
 }
 

modules/gui/macosx/prefs.m

@@ -108,9 +108,6 @@ static VLCPrefs *_o_sharedMainInstance = nil;
 
 - (void)showPrefs
 {
-    /* load our nib (if not already loaded) */
-    [NSBundle loadNibNamed:@"Preferences" owner:self];
-
     [o_prefs_window center];
     [o_prefs_window makeKeyAndOrderFront:self];
 }