xgiovio/dvdisaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync from upstream up to 22:14a375563e2b

Browse Source 
This includes the following commits:

changeset:   22:14a375563e2b
summary:     chang "while" command to "type -P" in bash based configure

changeset:   21:c4bf7c0f33d2
summary:     updated codec paper for RS01 life cycle

changeset:   20:dbcaad8128aa
summary:     replaced build count with mercurial changeset

changeset:   19:fba258a6acfa
summary:     Added tag 0.79.10 for changeset 49950be5a2ef

changeset:   18:49950be5a2ef
summary:     merged some debian patches

changeset:   17:815be3929c41
summary:     merged "easy" patches from Stéphane Lesimple's version

changeset:   16:7d15f8a958cb
summary:     Made printf format strings 32/64bit safe as suggested by Stéphane;

changeset:   15:1055a53b8d6d
summary:     reorganized code for --with-gui=[yes|no] option

changeset:   14:fbe2ae12a32c
summary:     Added tag 0.79.9 for changeset f2fdd6d3a1f5

changeset:   13:f2fdd6d3a1f5
summary:     updated TODO and CHANGELOG

And other changes that were needed to resolve the (many) conflicts.
This commit is contained in:
Stéphane Lesimple
2021-10-04 21:50:50 +02:00
parent 244111e7db
commit db4d3af31d
196 changed files with 17479 additions and 15516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/show-manual.c
View File

@@ -20,6 +20,9 @@
* along with dvdisaster. If not, see <http://www.gnu.org/licenses/>.
*/
/*** src type: only GUI code ***/
#ifdef WITH_GUI_YES
#include "dvdisaster.h"
#ifdef SYS_MINGW
@@ -27,6 +30,7 @@
#include "shellapi.h"
#endif
#ifndef SYS_MINGW
static void send_errormsg(int fd, char *format, ...)
{ va_list argp;
char *msg;
@@ -52,14 +56,19 @@ static int recv_errormsg(int fd, char **msg)
return n;
}
#endif
void ShowURL(char *target)
void GuiShowURL(char *target)
{ guint64 ignore;
pid_t pid;
int hyperlink = 0;
char *path, *msg;
char *path;
#ifndef SYS_MINGW
pid_t pid;
char *msg;
int err_pipe[2]; /* child may send down err msgs to us here */
int result;
#endif
if(target && !strncmp(target, "http", 4))
{ hyperlink = 1;
@@ -71,7 +80,7 @@ void ShowURL(char *target)
if(!hyperlink)
{ if(!Closure->docDir)
{
CreateMessage(_("Documentation not installed."), GTK_MESSAGE_ERROR);
GuiCreateMessage(_("Documentation not installed."), GTK_MESSAGE_ERROR);
return;
}
@@ -86,7 +95,7 @@ void ShowURL(char *target)
if(!LargeStat(path, &ignore))
{
CreateMessage(_("Documentation file\n%s\nnot found.\n"), GTK_MESSAGE_ERROR, path);
GuiCreateMessage(_("Documentation file\n%s\nnot found.\n"), GTK_MESSAGE_ERROR, path);
g_free(path);
return;
}
@@ -102,7 +111,7 @@ void ShowURL(char *target)
result = pipe2(err_pipe, O_CLOEXEC);
if(result == -1)
{ CreateMessage(_("Could not create pipe before fork"), GTK_MESSAGE_ERROR);
{ GuiCreateMessage(_("Could not create pipe before fork"), GTK_MESSAGE_ERROR);
return;
}
pid = fork();
@@ -110,7 +119,7 @@ void ShowURL(char *target)
if(pid == -1)
{ close(err_pipe[0]);
close(err_pipe[1]);
CreateMessage(_("Could not fork to start xdg-open"), GTK_MESSAGE_ERROR);
GuiCreateMessage(_("Could not fork to start xdg-open"), GTK_MESSAGE_ERROR);
return;
}
@@ -124,7 +133,7 @@ void ShowURL(char *target)
close(err_pipe[0]);
/* prepare args and try to exec xdg-open */
argv[argc++] = "xdg-open";
argv[argc++] = path;
argv[argc++] = NULL;
@@ -133,8 +142,8 @@ void ShowURL(char *target)
/* if we reach this, telegraph our parent that sth f*cked up */
send_errormsg(err_pipe[1],
_("execvp could not execute \"xdg-open\":\n%s\nIs xdg-open installed correctly?\n"),
strerror(errno));
_("execvp could not execute \"xdg-open\":\n%s\nIs xdg-open installed correctly?\n"),
strerror(errno));
close(err_pipe[1]);
_exit(110); /* couldn't execute */
}
@@ -146,7 +155,9 @@ void ShowURL(char *target)
close(err_pipe[0]);
if(result)
CreateMessage(msg, GTK_MESSAGE_ERROR);
{ GuiCreateMessage("%s", GTK_MESSAGE_ERROR, msg);
}
#endif
}
#endif