aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-navigation-action.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2007-10-28 22:02:06 +0800
committerChristian Persch <chpe@src.gnome.org>2007-10-28 22:02:06 +0800
commita8f58c18b35696da3281c3447abb07faab7ddddf (patch)
tree1a738de56ebe9e28b8c8021abbc54df594041d4e /src/ephy-navigation-action.c
parent7ac279fb909e69b040aeba85188b095f4f831176 (diff)
downloadgsoc2013-epiphany-a8f58c18b35696da3281c3447abb07faab7ddddf.tar
gsoc2013-epiphany-a8f58c18b35696da3281c3447abb07faab7ddddf.tar.gz
gsoc2013-epiphany-a8f58c18b35696da3281c3447abb07faab7ddddf.tar.bz2
gsoc2013-epiphany-a8f58c18b35696da3281c3447abb07faab7ddddf.tar.lz
gsoc2013-epiphany-a8f58c18b35696da3281c3447abb07faab7ddddf.tar.xz
gsoc2013-epiphany-a8f58c18b35696da3281c3447abb07faab7ddddf.tar.zst
gsoc2013-epiphany-a8f58c18b35696da3281c3447abb07faab7ddddf.zip
Remove EPhyTab.
svn path=/trunk/; revision=7598
Diffstat (limited to 'src/ephy-navigation-action.c')
-rw-r--r--src/ephy-navigation-action.c24
1 files changed, 8 insertions, 16 deletions
diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c
index f54b9fd9d..b994a9a6b 100644
--- a/src/ephy-navigation-action.c
+++ b/src/ephy-navigation-action.c
@@ -143,22 +143,14 @@ activate_by_history_index (EphyNavigationAction *action,
{
EphyEmbed *embed;
- embed = ephy_window_get_active_embed (action->priv->window);
+ embed = ephy_window_get_active_tab (action->priv->window);
g_return_if_fail (embed != NULL);
if (ephy_gui_is_middle_click ())
{
- EphyEmbed *dest;
- EphyTab *newTab;
-
- newTab = ephy_link_open (EPHY_LINK (action), "about:blank", NULL,
- EPHY_LINK_NEW_TAB);
- g_return_if_fail (newTab != NULL);
-
- dest = ephy_tab_get_embed (newTab);
- g_return_if_fail (dest != NULL);
-
- embed = dest;
+ embed = ephy_link_open (EPHY_LINK (action), "about:blank", NULL,
+ EPHY_LINK_NEW_TAB);
+ g_return_if_fail (embed != NULL);
}
ephy_embed_shistory_go_nth (embed, index);
}
@@ -211,7 +203,7 @@ activate_up_menu_item_cb (GtkWidget *menuitem,
EphyEmbed *embed;
char *url;
- embed = ephy_window_get_active_embed (action->priv->window);
+ embed = ephy_window_get_active_tab (action->priv->window);
g_return_if_fail (embed != NULL);
url = g_object_get_data (G_OBJECT (menuitem), URL_DATA_KEY);
@@ -230,7 +222,7 @@ build_back_or_forward_menu (EphyNavigationAction *action)
int pos, count;
int start, end;
- embed = ephy_window_get_active_embed (window);
+ embed = ephy_window_get_active_tab (window);
g_return_val_if_fail (embed != NULL, NULL);
pos = ephy_embed_shistory_get_pos (embed);
@@ -306,7 +298,7 @@ build_up_menu (EphyNavigationAction *action)
GSList *list, *l;
char *url;
- embed = ephy_window_get_active_embed (window);
+ embed = ephy_window_get_active_tab (window);
g_return_val_if_fail (embed != NULL, NULL);
menu = GTK_MENU_SHELL (gtk_menu_new ());
@@ -410,7 +402,7 @@ ephy_navigation_action_activate (GtkAction *gtk_action)
EphyEmbed *embed;
int pos;
- embed = ephy_window_get_active_embed (window);
+ embed = ephy_window_get_active_tab (window);
g_return_if_fail (embed != NULL);
pos = ephy_embed_shistory_get_pos (embed);