diff options
| author | François Revel <mmu_man@netsurf-browser.org> | 2012-03-19 03:19:03 +0000 |
|---|---|---|
| committer | François Revel <mmu_man@netsurf-browser.org> | 2012-03-19 03:19:03 +0000 |
| commit | 18b3ae0dec117ec313b83fa314a7c5578f46e223 (patch) | |
| tree | 61ce6fe5f5f07e9438143ad004efcd273976f63f /beos | |
| parent | ea94b3210ca4de0834d1a8df558222963beda59e (diff) | |
| download | netsurf-18b3ae0dec117ec313b83fa314a7c5578f46e223.tar.gz netsurf-18b3ae0dec117ec313b83fa314a7c5578f46e223.tar.bz2 | |
Since nsurl wants to add // to url schemes, just abide by it. Third / separates the type and name.
svn path=/trunk/netsurf/; revision=13534
Diffstat (limited to 'beos')
| -rw-r--r-- | beos/beos_fetch_rsrc.cpp | 8 | ||||
| -rw-r--r-- | beos/beos_gui.cpp | 2 | ||||
| -rw-r--r-- | beos/res/beosdefault.css | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/beos/beos_fetch_rsrc.cpp b/beos/beos_fetch_rsrc.cpp index 04e0d1ebb..15b2000a4 100644 --- a/beos/beos_fetch_rsrc.cpp +++ b/beos/beos_fetch_rsrc.cpp @@ -157,13 +157,13 @@ static bool fetch_rsrc_process(struct fetch_rsrc_context *c) int32 id = 0; /* format of a rsrc: URL is: - * rsrc:[TYPE][@NUM]/name[,mime] + * rsrc://[TYPE][@NUM]/name[,mime] */ LOG(("*** Processing %s", c->url)); - if (strlen(c->url) < 6) { - /* 6 is the minimum possible length (rsrc:/) */ + if (strlen(c->url) < 7) { + /* 7 is the minimum possible length (rsrc://) */ msg.type = FETCH_ERROR; msg.data.error = "Malformed rsrc: URL"; fetch_rsrc_send_callback(&msg, c); @@ -171,7 +171,7 @@ static bool fetch_rsrc_process(struct fetch_rsrc_context *c) } /* skip the rsrc: part */ - params = c->url + sizeof("rsrc:") - 1; + params = c->url + sizeof("rsrc://") - 1; /* find the slash */ if ( (slash = strchr(params, '/')) == NULL) { diff --git a/beos/beos_gui.cpp b/beos/beos_gui.cpp index 20ae6211e..e535b3658 100644 --- a/beos/beos_gui.cpp +++ b/beos/beos_gui.cpp @@ -421,7 +421,7 @@ static int32 bapp_thread(void *arg) nsurl *gui_get_resource_url(const char *path) { nsurl *url = NULL; - BString u("rsrc:/"); + BString u("rsrc:///"); if (strcmp(path, "default.css") == 0) u << "beosdefault.css"; else diff --git a/beos/res/beosdefault.css b/beos/res/beosdefault.css index da4681492..9b457d448 100644 --- a/beos/res/beosdefault.css +++ b/beos/res/beosdefault.css @@ -5,7 +5,7 @@ /* Load base stylesheet. */ /*@import "default.css";*/ -@import "rsrc:/default.css"; +@import "rsrc:///default.css"; /* Apply GTK specific rules. */ |