aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed-utils.c12
-rw-r--r--embed/ephy-embed-utils.h9
-rw-r--r--embed/ephy-web-view.c1
3 files changed, 17 insertions, 5 deletions
diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c
index e01842496..70c8a6c03 100644
--- a/embed/ephy-embed-utils.c
+++ b/embed/ephy-embed-utils.c
@@ -103,6 +103,13 @@ ephy_embed_utils_address_has_web_scheme (const char *address)
return has_web_scheme;
}
+gboolean
+ephy_embed_utils_address_is_existing_absolute_filename (const char *address)
+{
+ return g_path_is_absolute (address) &&
+ g_file_test (address, G_FILE_TEST_EXISTS);
+}
+
char*
ephy_embed_utils_normalize_address (const char *address)
{
@@ -111,6 +118,9 @@ ephy_embed_utils_normalize_address (const char *address)
g_return_val_if_fail (address, NULL);
+ if (ephy_embed_utils_address_is_existing_absolute_filename (address))
+ return g_strconcat ("file://", address, NULL);
+
uri = soup_uri_new (address);
/* FIXME: if we are here we passed through the "should we
@@ -123,7 +133,7 @@ ephy_embed_utils_normalize_address (const char *address)
* being the port. Ideally we should check if we have a
* handler for the scheme, and since we'll fail for localhost
* and IP, we'd fallback to loading it as a domain. */
- if (!uri ||
+ if (!uri ||
(uri && !g_strcmp0 (uri->scheme, "localhost")) ||
(uri && g_hostname_is_ip_address (uri->scheme)))
effective_address = g_strconcat ("http://", address, NULL);
diff --git a/embed/ephy-embed-utils.h b/embed/ephy-embed-utils.h
index cb7890002..4d8ded161 100644
--- a/embed/ephy-embed-utils.h
+++ b/embed/ephy-embed-utils.h
@@ -40,10 +40,11 @@ G_BEGIN_DECLS
#define EPHY_WEBKIT_BACK_FORWARD_LIMIT 100
-char* ephy_embed_utils_link_message_parse (char *message);
-gboolean ephy_embed_utils_address_has_web_scheme (const char *address);
-char* ephy_embed_utils_normalize_address (const char *address);
-gboolean ephy_embed_utils_url_is_empty (const char *location);
+char* ephy_embed_utils_link_message_parse (char *message);
+gboolean ephy_embed_utils_address_has_web_scheme (const char *address);
+gboolean ephy_embed_utils_address_is_existing_absolute_filename (const char *address);
+char* ephy_embed_utils_normalize_address (const char *address);
+gboolean ephy_embed_utils_url_is_empty (const char *location);
G_END_DECLS
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index f5249976c..c0b59db59 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -2417,6 +2417,7 @@ normalize_or_autosearch_url (EphyWebView *view, const char *url)
/* If the string doesn't look like an URI, let's search it; */
if (!ephy_embed_utils_address_has_web_scheme (url) &&
scheme == NULL &&
+ !ephy_embed_utils_address_is_existing_absolute_filename (url) &&
priv->non_search_regex &&
!g_regex_match (priv->non_search_regex, url, 0, NULL)) {
char *query_param, *url_search;