Commit a248b960 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

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.
parent cf09f019
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <sys/param.h> /* for MAXPATHLEN */ #include <sys/param.h> /* for MAXPATHLEN */
#include <string.h> #include <string.h>
#include <vlc_keys.h> #include <vlc_keys.h>
#include <vlc_dialog.h>
#include <unistd.h> /* execl() */ #include <unistd.h> /* execl() */
#import "intf.h" #import "intf.h"
...@@ -2126,7 +2127,7 @@ end: ...@@ -2126,7 +2127,7 @@ end:
[o_update showUpdateWindow]; [o_update showUpdateWindow];
#else #else
msg_Err( VLCIntf, "Update checker wasn't enabled in this build" ); 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 #endif
} }
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#import "prefs.h" #import "prefs.h"
#import <vlc_keys.h> #import <vlc_keys.h>
#import <vlc_interface.h> #import <vlc_interface.h>
#import <vlc_dialog.h>
#import "misc.h" #import "misc.h"
static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier"; 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 ...@@ -717,7 +718,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
if( i != 0 ) if( i != 0 )
{ {
msg_Err( p_intf, "An error occurred while saving the Interface settings using SimplePrefs (%i)", i ); 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 ); _("An error occured while saving your settings via SimplePrefs (%i)."), i );
i = 0; i = 0;
} }
...@@ -789,7 +790,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -789,7 +790,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
if( i != 0 ) if( i != 0 )
{ {
msg_Err( p_intf, "An error occurred while saving the Audio settings using SimplePrefs (%i)", i ); 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 ); _("An error occured while saving your settings via SimplePrefs (%i)."), i );
i = 0; i = 0;
...@@ -822,7 +823,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -822,7 +823,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
if( i != 0 ) if( i != 0 )
{ {
msg_Err( p_intf, "An error occurred while saving the Video settings using SimplePrefs (%i)", i ); 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 ); _("An error occured while saving your settings via SimplePrefs (%i)."), i );
i = 0; i = 0;
} }
...@@ -886,7 +887,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -886,7 +887,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
if( i != 0 ) if( i != 0 )
{ {
msg_Err( p_intf, "An error occurred while saving the Input settings using SimplePrefs (%i)", i ); 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 ); _("An error occured while saving your settings via SimplePrefs (%i)."), i );
i = 0; i = 0;
} }
...@@ -914,7 +915,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -914,7 +915,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
if( i != 0 ) if( i != 0 )
{ {
msg_Err( p_intf, "An error occurred while saving the OSD/Subtitle settings using SimplePrefs (%i)", i ); 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 ); _("An error occured while saving your settings via SimplePrefs (%i)."), i );
i = 0; i = 0;
} }
...@@ -939,7 +940,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -939,7 +940,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
if( i != 0 ) if( i != 0 )
{ {
msg_Err( p_intf, "An error occurred while saving the Hotkey settings using SimplePrefs (%i)", i ); 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 ); _("An error occured while saving your settings via SimplePrefs (%i)."), i );
i = 0; i = 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment