[vlc-commits] macosx: remove debug code and block Lion's fullscreen mode when disabling ' video-deco'

[Felix Paul Kühne]

vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu May 17 20:08:35 2012 +0200| [f3239670054a75bc151257a1224db27a73832c67] | committer: Felix Paul Kühne

macosx: remove debug code and block Lion's fullscreen mode when disabling 'video-deco'

Thanks to David Fuhrmann for the remarks
(cherry picked from commit 5003db864a87d4d9a017939945df29b03bb76ac2)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=f3239670054a75bc151257a1224db27a73832c67
---

 modules/gui/macosx/MainWindow.m |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 16003a9..2de9bc0 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -128,11 +128,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
     /* setup the styled interface */
     b_video_deco = config_GetInt( VLCIntf, "video-deco" );
-    if (b_video_deco)
-        b_nonembedded = YES;
     b_nativeFullscreenMode = NO;
 #ifdef MAC_OS_X_VERSION_10_7
-    if( OSX_LION )
+    if( OSX_LION && b_video_deco )
         b_nativeFullscreenMode = config_GetInt( VLCIntf, "macosx-nativefullscreenmode" );
 #endif
     i_lastShownVolume = -1;
@@ -2515,6 +2513,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
                   backing:(NSBackingStoreType)backingType defer:(BOOL)flag
 {
     b_dark_interface = config_GetInt( VLCIntf, "macosx-interfacestyle" );
+    b_video_deco = config_GetInt( VLCIntf, "video-deco" );
 
     if (b_dark_interface || !b_video_deco)
     {
@@ -2528,12 +2527,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 #endif
     }
 
-    b_video_deco = config_GetInt( VLCIntf, "video-deco" );
-    if (b_video_deco)
-        self = [super initWithContentRect:contentRect styleMask:styleMask
-                              backing:backingType defer:flag];
-    else
-        self = [super initWithContentRect:contentRect styleMask:styleMask
+    self = [super initWithContentRect:contentRect styleMask:styleMask
                                   backing:backingType defer:flag];
 
     /* we want to be moveable regardless of our style */