aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian de Navascues <julian.navascues@gmail.com>2009-07-29 20:22:41 +0800
committerXan Lopez <xan@gnome.org>2009-07-29 21:23:21 +0800
commit048b02780261819c29de2b43a1c1a18d3cbb066f (patch)
treeac400a0a7d276ec518a68aec571e19768b13cb7d
parent00bc21c873c32e476c666a8ed15c634c9889994d (diff)
downloadgsoc2013-epiphany-048b02780261819c29de2b43a1c1a18d3cbb066f.tar
gsoc2013-epiphany-048b02780261819c29de2b43a1c1a18d3cbb066f.tar.gz
gsoc2013-epiphany-048b02780261819c29de2b43a1c1a18d3cbb066f.tar.bz2
gsoc2013-epiphany-048b02780261819c29de2b43a1c1a18d3cbb066f.tar.lz
gsoc2013-epiphany-048b02780261819c29de2b43a1c1a18d3cbb066f.tar.xz
gsoc2013-epiphany-048b02780261819c29de2b43a1c1a18d3cbb066f.tar.zst
gsoc2013-epiphany-048b02780261819c29de2b43a1c1a18d3cbb066f.zip
Comments "about:recover" functionality
Because "about:recover:" is not implemented yet, Epiphany cant recover tabs that were loading during a crash. So this patch avoids the attempts to recover these tabs and therefore blank tabs wont be opened. Tabs that were fully loaded are still opened and loaded succesfully. Bug #583953 Signed-off-by: Xan Lopez <xan@gnome.org>
-rw-r--r--src/ephy-session.c36
1 files changed, 8 insertions, 28 deletions
diff --git a/src/ephy-session.c b/src/ephy-session.c
index e78849429..17d148293 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -1278,7 +1278,7 @@ parse_embed (xmlNodePtr child,
if (strcmp ((char *) child->name, "embed") == 0)
{
xmlChar *url, *attr;
- char *recover_url, *freeme = NULL;
+ char *recover_url;
gboolean was_loading;
g_return_if_fail (window != NULL);
@@ -1292,40 +1292,20 @@ parse_embed (xmlNodePtr child,
url = xmlGetProp (child, (const xmlChar *) "url");
if (url == NULL) continue;
+ /* about:recover is not implemented, so tabs
+ loading during crash wont be recovered (bug #583953) */
if (!was_loading ||
strcmp ((const char *) url, "about:blank") == 0)
{
recover_url = (char *) url;
- }
- else
- {
- xmlChar *title;
- char *escaped_url, *escaped_title;
-
- title = xmlGetProp (child, (const xmlChar *) "title");
- escaped_title = g_uri_escape_string (title ? (const char*) title : _("Untitled"),
- NULL, TRUE);
-
- escaped_url = g_uri_escape_string ((const char *) url,
- NULL, TRUE);
- freeme = recover_url =
- g_strconcat ("about:recover?u=",
- escaped_url,
- "&c=UTF-8&t=",
- escaped_title, NULL);
-
- xmlFree (title);
- g_free (escaped_url);
- g_free (escaped_title);
- }
- ephy_shell_new_tab (ephy_shell, window, NULL, recover_url,
- EPHY_NEW_TAB_IN_EXISTING_WINDOW |
- EPHY_NEW_TAB_OPEN_PAGE |
- EPHY_NEW_TAB_APPEND_LAST);
+ ephy_shell_new_tab (ephy_shell, window, NULL, recover_url,
+ EPHY_NEW_TAB_IN_EXISTING_WINDOW |
+ EPHY_NEW_TAB_OPEN_PAGE |
+ EPHY_NEW_TAB_APPEND_LAST);
+ }
xmlFree (url);
- g_free (freeme);
}
child = child->next;