guix
/
guix
mirror of git://git.savannah.gnu.org/guix.git
3
4
Fork 0
Code Issues Releases Wiki Activity

gnu: Actually add patch. 

This follows up on ec2c7d4546.

* gnu/packages/patches/alpine-fix-privacy-policy-crash.patch:
New new file.
This commit is contained in:
Tobias Geerinckx-Rice 2021-10-15 17:37:26 +02:00
parent dfa2e5b44b
commit 5f4ee945c4
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gnu/packages/patches/alpine-fix-privacy-policy-crash.patch Normal file
View File

@ -0,0 +1,39 @@
X-Git-Url: https://repo.or.cz/alpine.git/blobdiff_plain/fb2217ac67706e4cbef69bea41041e2fb8b910e9..3ee981816abfb7d47ffc0ac522fff002b5749b72:/alpine/help.c
diff --git a/alpine/help.c b/alpine/help.c
index 4f1bf46..e9c7b34 100644
--- a/alpine/help.c
+++ b/alpine/help.c
@@ -36,6 +36,7 @@ static char rcsid[] = "$Id: help.c 1032 2008-04-11 00:30:04Z hubert@u.washington
#include "../pith/detoken.h"
#include "../pith/list.h"
#include "../pith/margin.h"
+#include "../pith/busy.h"
typedef struct _help_scroll {
@@ -135,10 +136,12 @@ helper_internal(HelpType text, char *frag, char *title, int flags)
is_external = 0;
if(shown_text && *shown_text && !struncmp(*shown_text, "x-alpine-http:", 14)){
- int status;
+ int status, we_cancel = 0;
+
+ we_cancel = busy_cue(_("Retrieving help text"), NULL, 1);
HTTPSTREAM *stream = http_open(*shown_text + 14);
if(stream) help_text = http_get(stream, NULL);
- status = stream->status ? stream->status->code : -1;
+ status = stream && stream->status ? stream->status->code : -1;
if(stream) http_close(stream);
if(status != HTTP_OK){
shown_text = NO_HELP;
@@ -165,7 +168,8 @@ helper_internal(HelpType text, char *frag, char *title, int flags)
*rv = NULL;
}
}
-
+ if(we_cancel)
+ cancel_busy_cue(-1);
}
if(F_ON(F_BLANK_KEYMENU,ps_global)){