summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-07-08 11:33:02 +0200
committerManuel Rego Casasnovas <rego@igalia.com>2013-08-28 11:04:11 +0200
commitd78a94e9919ee78455b629ef4b35308b7480fad2 (patch)
tree77d5b4134ede37c782ff63c7cd6d09f20b800470
parent39b49e9d18e9154ed9e42c5ee1367043259c8fe1 (diff)
downloadepiphany-kiosk-mode.tar.gz
ephy-string: Avoid poking at remote websiteskiosk-mode
Epiphany tries to query the existence of remote sites before loading their page. This causes problems when the remote site is not available and loading it requires the query to timeout (epiphany would look like it's not loading the site for up to 60 seconds) or for one-time URLs (where it might invalidate the query, such as for password resets, or confirmation e-mails). We'll now only check whether the file exists so that incomplete URLs ("epiphany foo.com/bar.html") still loads the bar.html file if it exists locally, but the remote website if not. https://bugzilla.gnome.org/show_bug.cgi?id=703772
-rw-r--r--lib/ephy-string.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ephy-string.c b/lib/ephy-string.c
index 54b83125f..47d8f5ac1 100644
--- a/lib/ephy-string.c
+++ b/lib/ephy-string.c
@@ -493,7 +493,7 @@ ephy_string_expand_initial_tilde (const char *path)
* ephy_string_commandline_args_to_uris:
* @arguments: a %NULL-terminated array of chars.
*
- * Transform commandline arguments to URIs if they exist,
+ * Transform commandline arguments to URIs if they are native,
* otherwise simply transform them to UTF-8.
*
* Returns: a newly allocated array with the URIs and
@@ -513,7 +513,7 @@ ephy_string_commandline_args_to_uris (char **arguments, GError **error)
for (i = 0; arguments[i] != NULL; ++i) {
file = g_file_new_for_commandline_arg (arguments [i]);
- if (g_file_query_exists (file, NULL)) {
+ if (g_file_is_native (file) && g_file_query_exists (file, NULL)) {
args[i] = g_file_get_uri (file);
} else {
args[i] = g_locale_to_utf8 (arguments [i], -1,