For some reason, the OSX interface uses intf_UserFatal...

This makes little sense to me. It could print errors directly, since it
_is_ the user interface.

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 48d2a8cbe9c76286ee3ea43ed8c7074af965b77b..5bcd50c8b17c0c956e16f34fb95683554504a683 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -31,6 +31,7 @@
 #include <sys/param.h>                                    /* for MAXPATHLEN */
 #include <string.h>
 #include <vlc_keys.h>
+#include <vlc_dialog.h>
 #include <unistd.h> /* execl() */
 
 #import "intf.h"
@@ -2126,7 +2127,7 @@ end:
     [o_update showUpdateWindow];
 #else
     msg_Err( VLCIntf, "Update checker wasn't enabled in this build" );
-    intf_UserFatal( VLCIntf, false, _("Update check failed"), _("Checking for updates was not enabled in this build.") );
+    dialog_Fatal( VLCIntf, _("Update check failed"), _("Checking for updates was not enabled in this build.") );
 #endif
 }
 

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 00011b4460c32b3b9ba68dfdb4c03cdc0e2c05af..adc3b7f7a25299c13d8a0e2d90f46c0be239ae70 100644 (file)
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -25,6 +25,7 @@
 #import "prefs.h"
 #import <vlc_keys.h>
 #import <vlc_interface.h>
+#import <vlc_dialog.h>
 #import "misc.h"
 
 static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
@@ -717,7 +718,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
         if( i != 0 )
         {
             msg_Err( p_intf, "An error occurred while saving the Interface settings using SimplePrefs (%i)", i );
-            intf_UserFatal( p_intf, false, _("Interface Settings not saved"),
+            dialog_Fatal( p_intf, _("Interface Settings not saved"),
                         _("An error occured while saving your settings via SimplePrefs (%i)."), i );
             i = 0;
         }
@@ -789,7 +790,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
         if( i != 0 )
         {
             msg_Err( p_intf, "An error occurred while saving the Audio settings using SimplePrefs (%i)", i );
-            intf_UserFatal( p_intf, false, _("Audio Settings not saved"),
+            dialog_Fatal( p_intf, _("Audio Settings not saved"),
                         _("An error occured while saving your settings via SimplePrefs (%i)."), i );
             
             i = 0;
@@ -822,7 +823,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
         if( i != 0 )
         {
             msg_Err( p_intf, "An error occurred while saving the Video settings using SimplePrefs (%i)", i );
-            intf_UserFatal( p_intf, false, _("Video Settings not saved"),
+            dialog_Fatal( p_intf, _("Video Settings not saved"),
                         _("An error occured while saving your settings via SimplePrefs (%i)."), i );
             i = 0;
         }
@@ -886,7 +887,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
         if( i != 0 )
         {
             msg_Err( p_intf, "An error occurred while saving the Input settings using SimplePrefs (%i)", i );
-            intf_UserFatal( p_intf, false, _("Input Settings not saved"),
+            dialog_Fatal( p_intf, _("Input Settings not saved"),
                         _("An error occured while saving your settings via SimplePrefs (%i)."), i );
             i = 0;
         }
@@ -914,7 +915,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
         if( i != 0 )
         {
             msg_Err( p_intf, "An error occurred while saving the OSD/Subtitle settings using SimplePrefs (%i)", i );
-            intf_UserFatal( p_intf, false, _("On Screen Display/Subtitle Settings not saved"),
+            dialog_Fatal( p_intf, _("On Screen Display/Subtitle Settings not saved"),
                         _("An error occured while saving your settings via SimplePrefs (%i)."), i );
             i = 0;
         }
@@ -939,7 +940,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
         if( i != 0 )
         {
             msg_Err( p_intf, "An error occurred while saving the Hotkey settings using SimplePrefs (%i)", i );
-            intf_UserFatal( p_intf, false, _("Hotkeys not saved"),
+            dialog_Fatal( p_intf, _("Hotkeys not saved"),
                         _("An error occured while saving your settings via SimplePrefs (%i)."), i );
             i = 0;
         }