Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/7c9066b49faed1a4f614a...
...commit
http://git.netsurf-browser.org/netsurf.git/commit/7c9066b49faed1a4f614a4f...
...tree
http://git.netsurf-browser.org/netsurf.git/tree/7c9066b49faed1a4f614a4f2a...
The branch, master has been updated
via 7c9066b49faed1a4f614a4f2a3f4f6462b377d25 (commit)
from d0a9fc3e35113e8734d10338856a43599f98d50c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=7c9066b49faed1a4f61...
commit 7c9066b49faed1a4f614a4f2a3f4f6462b377d25
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
No reason why RISC OS ,type extensions should end up in the Amiga resources any more
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 43dd351..ae99450 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -781,21 +781,7 @@ static nsurl *gui_get_resource_url(const char *path)
nsurl *url = NULL;
if(ami_locate_resource(buf, path) == false)
- {
- if((strncmp(path + strlen(path) - SLEN(".htm"), ".htm",
SLEN(".htm")) == 0) ||
- (strncmp(path + strlen(path) - SLEN(".html"), ".html",
SLEN(".html")) == 0))
- {
- /* Try with RISC OS HTML filetype, might work */
- strcpy(path2, path);
- strcat(path2, ",faf");
-
- if(ami_locate_resource(buf, path2) == false)
- {
- return NULL;
- }
- }
- else return NULL;
- }
+ return NULL;
netsurf_path_to_nsurl(buf, &url);
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/gui.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 43dd351..ae99450 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -781,21 +781,7 @@ static nsurl *gui_get_resource_url(const char *path)
nsurl *url = NULL;
if(ami_locate_resource(buf, path) == false)
- {
- if((strncmp(path + strlen(path) - SLEN(".htm"), ".htm",
SLEN(".htm")) == 0) ||
- (strncmp(path + strlen(path) - SLEN(".html"), ".html",
SLEN(".html")) == 0))
- {
- /* Try with RISC OS HTML filetype, might work */
- strcpy(path2, path);
- strcat(path2, ",faf");
-
- if(ami_locate_resource(buf, path2) == false)
- {
- return NULL;
- }
- }
- else return NULL;
- }
+ return NULL;
netsurf_path_to_nsurl(buf, &url);
--
NetSurf Browser