[epiphany] Remove ephy_web_view_copy_back_history()
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Remove ephy_web_view_copy_back_history()
- Date: Tue, 18 Feb 2014 13:45:51 +0000 (UTC)
commit ee05cfc60c8fecc018eb4c8238f5927e41c82423
Author: Carlos Garcia Campos <cgarcia igalia com>
Date: Wed Feb 12 11:03:56 2014 +0100
Remove ephy_web_view_copy_back_history()
It's currently unimplemented, we can bring it back eventually if we can
copy the back history and it's needed.
embed/ephy-web-view.c | 18 ------------------
embed/ephy-web-view.h | 2 --
src/ephy-navigation-history-action.c | 5 ++---
src/ephy-session.c | 3 +--
src/ephy-shell.c | 7 -------
src/ephy-shell.h | 4 ----
src/ephy-window.c | 2 --
7 files changed, 3 insertions(+), 38 deletions(-)
---
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 4397c37..4ef4007 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -2264,24 +2264,6 @@ ephy_web_view_load_url (EphyWebView *view,
}
/**
- * ephy_web_view_copy_back_history:
- * @source: the #EphyWebView from which to get the back history
- * @dest: the #EphyWebView to copy the history to
- *
- * Sets the back history (up to the current item) of @source as the
- * back history of @dest.
- *
- * Useful to keep the history when opening links in new tabs or
- * windows.
- **/
-void
-ephy_web_view_copy_back_history (EphyWebView *source,
- EphyWebView *dest)
-{
- /* TODO: WebKit2, BackForwardList */
-}
-
-/**
* ephy_web_view_get_is_blank:
* @view: an #EphyWebView
*
diff --git a/embed/ephy-web-view.h b/embed/ephy-web-view.h
index 7829627..73f740a 100644
--- a/embed/ephy-web-view.h
+++ b/embed/ephy-web-view.h
@@ -119,8 +119,6 @@ void ephy_web_view_load_request (EphyWebView
WebKitURIRequest *request);
void ephy_web_view_load_url (EphyWebView *view,
const char *url);
-void ephy_web_view_copy_back_history (EphyWebView *source,
- EphyWebView *dest);
gboolean ephy_web_view_is_loading (EphyWebView *view);
gboolean ephy_web_view_load_failed (EphyWebView *view);
const char * ephy_web_view_get_loading_title (EphyWebView *view);
diff --git a/src/ephy-navigation-history-action.c b/src/ephy-navigation-history-action.c
index 246fa3a..9737e84 100644
--- a/src/ephy-navigation-history-action.c
+++ b/src/ephy-navigation-history-action.c
@@ -116,7 +116,7 @@ action_activate (GtkAction *action)
EPHY_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (embed))),
NULL,
NULL,
- EPHY_NEW_TAB_IN_EXISTING_WINDOW | EPHY_NEW_TAB_DONT_COPY_HISTORY);
+ EPHY_NEW_TAB_IN_EXISTING_WINDOW);
web_view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed);
webkit_web_view_load_uri (web_view, back_uri);
@@ -328,8 +328,7 @@ middle_click_handle_on_history_menu_item (EphyNavigationHistoryAction *action,
EPHY_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (embed))),
embed,
NULL,
- EPHY_NEW_TAB_IN_EXISTING_WINDOW |
- EPHY_NEW_TAB_DONT_COPY_HISTORY);
+ EPHY_NEW_TAB_IN_EXISTING_WINDOW);
g_return_if_fail (new_embed != NULL);
/* We manually set the back history instead of trusting
diff --git a/src/ephy-session.c b/src/ephy-session.c
index 71ff32e..9f14cc9 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -233,8 +233,7 @@ ephy_session_undo_close_tab (EphySession *session)
ClosedTab *tab;
EphyNewTabFlags flags = EPHY_NEW_TAB_OPEN_PAGE
| EPHY_NEW_TAB_PRESENT_WINDOW
- | EPHY_NEW_TAB_JUMP
- | EPHY_NEW_TAB_DONT_COPY_HISTORY;
+ | EPHY_NEW_TAB_JUMP;
g_return_if_fail (EPHY_IS_SESSION (session));
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index e8aec4f..9b66551 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -674,7 +674,6 @@ ephy_shell_new_tab_full (EphyShell *shell,
gboolean delayed_open_page = FALSE;
gboolean jump_to = FALSE;
gboolean active_is_blank = FALSE;
- gboolean copy_history = TRUE;
gboolean is_empty = FALSE;
int position = -1;
@@ -689,7 +688,6 @@ ephy_shell_new_tab_full (EphyShell *shell,
if (flags & EPHY_NEW_TAB_DELAYED_OPEN_PAGE) delayed_open_page = TRUE;
if (flags & EPHY_NEW_TAB_IN_NEW_WINDOW) in_new_window = TRUE;
if (flags & EPHY_NEW_TAB_IN_EXISTING_WINDOW) in_new_window = FALSE;
- if (flags & EPHY_NEW_TAB_DONT_COPY_HISTORY) copy_history = FALSE;
if (flags & EPHY_NEW_TAB_JUMP) jump_to = TRUE;
fullscreen_lockdown = g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,
@@ -745,11 +743,6 @@ ephy_shell_new_tab_full (EphyShell *shell,
ephy_embed_container_add_child (EPHY_EMBED_CONTAINER (window), embed, position, jump_to);
}
- if (copy_history && previous_embed != NULL) {
- ephy_web_view_copy_back_history (ephy_embed_get_web_view (previous_embed),
- ephy_embed_get_web_view (embed));
- }
-
ephy_gui_window_update_user_time (GTK_WIDGET (window), user_time);
if ((flags & EPHY_NEW_TAB_DONT_SHOW_WINDOW) == 0 &&
diff --git a/src/ephy-shell.h b/src/ephy-shell.h
index 2cb6fc8..5a80bbd 100644
--- a/src/ephy-shell.h
+++ b/src/ephy-shell.h
@@ -72,8 +72,6 @@ typedef struct _EphyShellPrivate EphyShellPrivate;
* @EPHY_NEW_TAB_FROM_EXTERNAL: tries to open the new tab in the current
* active tab if it is currently not loading anything and is
* blank.
- * @EPHY_NEW_TAB_DONT_COPY_HISTORY: do not copy the back-forward history
- * from the current active tab to the new one.
* @EPHY_NEW_TAB_PRESENT_WINDOW: present the active window.
*
* Controls how new tabs/windows are created and handled.
@@ -102,8 +100,6 @@ typedef enum {
/* The way to load */
EPHY_NEW_TAB_FROM_EXTERNAL = 1 << 13,
- EPHY_NEW_TAB_DONT_COPY_HISTORY = 1 << 14,
-
} EphyNewTabFlags;
typedef enum {
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 52d8ed4..51bd7fb 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -569,8 +569,6 @@ ephy_window_open_link (EphyLink *link,
if (flags & EPHY_LINK_HOME_PAGE)
{
ntflags |= EPHY_NEW_TAB_HOME_PAGE;
- if (flags & EPHY_LINK_NEW_TAB)
- ntflags |= EPHY_NEW_TAB_DONT_COPY_HISTORY;
}
new_embed = ephy_shell_new_tab
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]