[vlc-devel] commit: Use dialog_FatalWait ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar  7 18:12:18 2009 +0200| [28b1a8ac12a80e8302918ae1ec2b7441294a0258] | committer: Rémi Denis-Courmont 

Use dialog_FatalWait

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

 modules/access/dvb/access.c |    2 +-
 modules/access/qtcapture.m  |    2 +-
 src/misc/update.c           |   15 ++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index 23952dd..eee84ff 100644
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -936,7 +936,7 @@ static int ParseMRL( access_t *p_access )
     {
         msg_Err( p_access, "the DVB input old syntax is deprecated, use vlc "
                           "-p dvb to see an explanation of the new syntax" );
-        intf_UserFatal( p_access, true, _("Input syntax is deprecated"),
+        dialog_FatalWait( p_access, _("Input syntax is deprecated"),
             _("The given syntax is deprecated. Run \"vlc -p dvb\" to see an " \
                 "explanation of the new syntax.") );
         free( psz_dup );
diff --git a/modules/access/qtcapture.m b/modules/access/qtcapture.m
index 525dc4a..3421a6d 100644
--- a/modules/access/qtcapture.m
+++ b/modules/access/qtcapture.m
@@ -222,7 +222,7 @@ static int Open( vlc_object_t *p_this )
     p_sys->device = [QTCaptureDevice defaultInputDeviceWithMediaType: QTMediaTypeVideo];
     if( !p_sys->device )
     {
-        intf_UserFatal( p_demux, true, _("No Input device found"),
+        dialog_FatalWait( p_demux, _("No Input device found"),
                         _("Your Mac does not seem to be equipped with a suitable input device. "
                           "Please check your connectors and drivers.") );
         msg_Err( p_demux, "Can't find any Video device" );
diff --git a/src/misc/update.c b/src/misc/update.c
index 07ae0ab..846a857 100644
--- a/src/misc/update.c
+++ b/src/misc/update.c
@@ -51,6 +51,7 @@
 #include <vlc_strings.h>
 #include <vlc_charset.h>
 #include <vlc_interface.h>
+#include <vlc_dialog.h>
 
 #include <gcrypt.h>
 #include <vlc_gcrypt.h>
@@ -1569,7 +1570,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
     if( !p_file )
     {
         msg_Err( p_udt, "Failed to open %s for writing", psz_destfile );
-        intf_UserFatal( p_udt, true, _("Saving file failed"),
+        dialog_FatalWait( p_udt, _("Saving file failed"),
             _("Failed to open \"%s\" for writing"),
              psz_destfile );
         goto end;
@@ -1645,7 +1646,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
     {
         utf8_unlink( psz_destfile );
 
-        intf_UserFatal( p_udt, true, _("File could not be verified"),
+        dialog_FatalWait( p_udt, _("File could not be verified"),
             _("It was not possible to download a cryptographic signature for "
               "the downloaded file \"%s\". Thus, it was deleted."),
             psz_destfile );
@@ -1657,7 +1658,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
     {
         utf8_unlink( psz_destfile );
         msg_Err( p_udt, "Invalid signature issuer" );
-        intf_UserFatal( p_udt, true, _("Invalid signature"),
+        dialog_FatalWait( p_udt, _("Invalid signature"),
             _("The cryptographic signature for the downloaded file \"%s\" was "
               "invalid and could not be used to securely verify it. Thus, the "
               "file was deleted."),
@@ -1669,7 +1670,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
     {
         utf8_unlink( psz_destfile );
         msg_Err( p_udt, "Invalid signature type" );
-        intf_UserFatal( p_udt, true, _("Invalid signature"),
+        dialog_FatalWait( p_udt, _("Invalid signature"),
             _("The cryptographic signature for the downloaded file \"%s\" was "
               "invalid and could not be used to securely verify it. Thus, the "
               "file was deleted."),
@@ -1682,7 +1683,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
     {
         msg_Err( p_udt, "Unable to hash %s", psz_destfile );
         utf8_unlink( psz_destfile );
-        intf_UserFatal( p_udt, true, _("File not verifiable"),
+        dialog_FatalWait( p_udt, _("File not verifiable"),
             _("It was not possible to securely verify the downloaded file"
               " \"%s\". Thus, it was deleted."),
             psz_destfile );
@@ -1694,7 +1695,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
         p_hash[1] != sign.hash_verification[1] )
     {
         utf8_unlink( psz_destfile );
-        intf_UserFatal( p_udt, true, _("File corrupted"),
+        dialog_FatalWait( p_udt, _("File corrupted"),
             _("Downloaded file \"%s\" was corrupted. Thus, it was deleted."),
              psz_destfile );
         msg_Err( p_udt, "Bad SHA1 hash for %s", psz_destfile );
@@ -1706,7 +1707,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
             != VLC_SUCCESS )
     {
         utf8_unlink( psz_destfile );
-        intf_UserFatal( p_udt, true, _("File corrupted"),
+        dialog_FatalWait( p_udt, _("File corrupted"),
             _("Downloaded file \"%s\" was corrupted. Thus, it was deleted."),
              psz_destfile );
         msg_Err( p_udt, "BAD SIGNATURE for %s", psz_destfile );