Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
28b1a8ac
Commit
28b1a8ac
authored
Mar 07, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use dialog_FatalWait
parent
cde300c7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
modules/access/dvb/access.c
modules/access/dvb/access.c
+1
-1
modules/access/qtcapture.m
modules/access/qtcapture.m
+1
-1
src/misc/update.c
src/misc/update.c
+8
-7
No files found.
modules/access/dvb/access.c
View file @
28b1a8ac
...
@@ -936,7 +936,7 @@ static int ParseMRL( access_t *p_access )
...
@@ -936,7 +936,7 @@ static int ParseMRL( access_t *p_access )
{
{
msg_Err
(
p_access
,
"the DVB input old syntax is deprecated, use vlc "
msg_Err
(
p_access
,
"the DVB input old syntax is deprecated, use vlc "
"-p dvb to see an explanation of the new syntax"
);
"-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 "
\
_
(
"The given syntax is deprecated. Run
\"
vlc -p dvb
\"
to see an "
\
"explanation of the new syntax."
)
);
"explanation of the new syntax."
)
);
free
(
psz_dup
);
free
(
psz_dup
);
...
...
modules/access/qtcapture.m
View file @
28b1a8ac
...
@@ -222,7 +222,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -222,7 +222,7 @@ static int Open( vlc_object_t *p_this )
p_sys
->
device
=
[
QTCaptureDevice
defaultInputDeviceWithMediaType
:
QTMediaTypeVideo
];
p_sys
->
device
=
[
QTCaptureDevice
defaultInputDeviceWithMediaType
:
QTMediaTypeVideo
];
if
(
!
p_sys
->
device
)
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. "
_
(
"Your Mac does not seem to be equipped with a suitable input device. "
"Please check your connectors and drivers."
)
);
"Please check your connectors and drivers."
)
);
msg_Err
(
p_demux
,
"Can't find any Video device"
);
msg_Err
(
p_demux
,
"Can't find any Video device"
);
...
...
src/misc/update.c
View file @
28b1a8ac
...
@@ -51,6 +51,7 @@
...
@@ -51,6 +51,7 @@
#include <vlc_strings.h>
#include <vlc_strings.h>
#include <vlc_charset.h>
#include <vlc_charset.h>
#include <vlc_interface.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
#include <gcrypt.h>
#include <gcrypt.h>
#include <vlc_gcrypt.h>
#include <vlc_gcrypt.h>
...
@@ -1569,7 +1570,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
...
@@ -1569,7 +1570,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
if
(
!
p_file
)
if
(
!
p_file
)
{
{
msg_Err
(
p_udt
,
"Failed to open %s for writing"
,
psz_destfile
);
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"
),
_
(
"Failed to open
\"
%s
\"
for writing"
),
psz_destfile
);
psz_destfile
);
goto
end
;
goto
end
;
...
@@ -1645,7 +1646,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
...
@@ -1645,7 +1646,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
{
{
utf8_unlink
(
psz_destfile
);
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 "
_
(
"It was not possible to download a cryptographic signature for "
"the downloaded file
\"
%s
\"
. Thus, it was deleted."
),
"the downloaded file
\"
%s
\"
. Thus, it was deleted."
),
psz_destfile
);
psz_destfile
);
...
@@ -1657,7 +1658,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
...
@@ -1657,7 +1658,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
{
{
utf8_unlink
(
psz_destfile
);
utf8_unlink
(
psz_destfile
);
msg_Err
(
p_udt
,
"Invalid signature issuer"
);
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 "
_
(
"The cryptographic signature for the downloaded file
\"
%s
\"
was "
"invalid and could not be used to securely verify it. Thus, the "
"invalid and could not be used to securely verify it. Thus, the "
"file was deleted."
),
"file was deleted."
),
...
@@ -1669,7 +1670,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
...
@@ -1669,7 +1670,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
{
{
utf8_unlink
(
psz_destfile
);
utf8_unlink
(
psz_destfile
);
msg_Err
(
p_udt
,
"Invalid signature type"
);
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 "
_
(
"The cryptographic signature for the downloaded file
\"
%s
\"
was "
"invalid and could not be used to securely verify it. Thus, the "
"invalid and could not be used to securely verify it. Thus, the "
"file was deleted."
),
"file was deleted."
),
...
@@ -1682,7 +1683,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
...
@@ -1682,7 +1683,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
{
{
msg_Err
(
p_udt
,
"Unable to hash %s"
,
psz_destfile
);
msg_Err
(
p_udt
,
"Unable to hash %s"
,
psz_destfile
);
utf8_unlink
(
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"
_
(
"It was not possible to securely verify the downloaded file"
"
\"
%s
\"
. Thus, it was deleted."
),
"
\"
%s
\"
. Thus, it was deleted."
),
psz_destfile
);
psz_destfile
);
...
@@ -1694,7 +1695,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
...
@@ -1694,7 +1695,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
p_hash
[
1
]
!=
sign
.
hash_verification
[
1
]
)
p_hash
[
1
]
!=
sign
.
hash_verification
[
1
]
)
{
{
utf8_unlink
(
psz_destfile
);
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."
),
_
(
"Downloaded file
\"
%s
\"
was corrupted. Thus, it was deleted."
),
psz_destfile
);
psz_destfile
);
msg_Err
(
p_udt
,
"Bad SHA1 hash for %s"
,
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 )
...
@@ -1706,7 +1707,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
!=
VLC_SUCCESS
)
!=
VLC_SUCCESS
)
{
{
utf8_unlink
(
psz_destfile
);
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."
),
_
(
"Downloaded file
\"
%s
\"
was corrupted. Thus, it was deleted."
),
psz_destfile
);
psz_destfile
);
msg_Err
(
p_udt
,
"BAD SIGNATURE for %s"
,
psz_destfile
);
msg_Err
(
p_udt
,
"BAD SIGNATURE for %s"
,
psz_destfile
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment