[epiphany] Remove NavigationUp
- From: Xan Lopez <xan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Remove NavigationUp
- Date: Tue, 20 Dec 2011 16:56:19 +0000 (UTC)
commit 9ccc3fb7f66191a4131f9b150304b3c43a3ecdda
Author: Xan Lopez <xan igalia com>
Date: Tue Dec 20 15:17:22 2011 +0100
Remove NavigationUp
It's not used anymore.
src/Makefile.am | 2 -
src/ephy-lockdown.c | 1 -
src/ephy-navigation-up-action.c | 78 ---------------------------------------
src/ephy-navigation-up-action.h | 57 ----------------------------
src/ephy-window.c | 22 -----------
5 files changed, 0 insertions(+), 160 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index d71fd42..14705e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,6 @@ NOINST_H_FILES = \
ephy-location-action.h \
ephy-navigation-action.h \
ephy-navigation-history-action.h \
- ephy-navigation-up-action.h \
ephy-password-info.h \
languages.h \
pdm-dialog.h \
@@ -67,7 +66,6 @@ libephymain_la_SOURCES = \
ephy-lockdown.c \
ephy-navigation-action.c \
ephy-navigation-history-action.c \
- ephy-navigation-up-action.c \
ephy-notebook.c \
ephy-password-info.c \
ephy-session.c \
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c
index 801b08a..bd40f2a 100644
--- a/src/ephy-lockdown.c
+++ b/src/ephy-lockdown.c
@@ -129,7 +129,6 @@ static const BindAction popup_actions[] = {
static const BindAction special_toolbar_actions[] = {
{ EPHY_PREFS_LOCKDOWN_ARBITRARY_URL, "Location", "editable" },
- { EPHY_PREFS_LOCKDOWN_ARBITRARY_URL, "NavigationUp", "sensitive" },
{ EPHY_PREFS_LOCKDOWN_HISTORY, "NavigationBack", "visible" },
{ EPHY_PREFS_LOCKDOWN_HISTORY, "NavigationBack", "sensitive" },
diff --git a/src/ephy-window.c b/src/ephy-window.c
index a3b2f04..9aa3f3c 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -48,7 +48,6 @@
#include "ephy-location-entry.h"
#include "ephy-navigation-action.h"
#include "ephy-navigation-history-action.h"
-#include "ephy-navigation-up-action.h"
#include "ephy-notebook.h"
#include "ephy-prefs.h"
#include "ephy-settings.h"
@@ -404,8 +403,6 @@ static const struct
{ GDK_KEY_KP_4, GDK_MOD1_MASK /*Alt*/, "NavigationBack", TRUE },
{ GDK_KEY_KP_Right, GDK_MOD1_MASK /*Alt*/, "NavigationForward", TRUE },
{ GDK_KEY_KP_6, GDK_MOD1_MASK /*Alt*/, "NavigationForward", TRUE },
- { GDK_KEY_KP_Up, GDK_MOD1_MASK /*Alt*/, "NavigationUp", TRUE },
- { GDK_KEY_KP_8, GDK_MOD1_MASK /*Alt*/, "NavigationUp", TRUE },
{ GDK_KEY_KP_Page_Up, GDK_CONTROL_MASK, "TabsPrevious", FALSE },
{ GDK_KEY_KP_9, GDK_CONTROL_MASK, "TabsPrevious", FALSE },
{ GDK_KEY_KP_Page_Down, GDK_CONTROL_MASK, "TabsNext", FALSE },
@@ -1658,18 +1655,6 @@ setup_ui_manager (EphyWindow *window)
"<alt>Right");
g_object_unref (action);
- action =
- g_object_new (EPHY_TYPE_NAVIGATION_UP_ACTION,
- "name", "NavigationUp",
- "label", _("_Up"),
- "stock_id", GTK_STOCK_GO_UP,
- "tooltip", _("Go up one level"),
- "window", window,
- NULL);
- gtk_action_group_add_action_with_accel (action_group, action,
- "<alt>Up");
- g_object_unref (action);
-
/* FIXME: I'm still waiting for the exact term to
* user here from the docs team.
*/
@@ -1856,8 +1841,6 @@ _ephy_window_set_navigation_actions (EphyWindow *window,
ephy_action_change_sensitivity_flags (action, SENS_FLAG, !back);
action = gtk_action_group_get_action (priv->toolbar_action_group, "NavigationForward");
ephy_action_change_sensitivity_flags (action, SENS_FLAG, !forward);
- action = gtk_action_group_get_action (priv->toolbar_action_group, "NavigationUp");
- ephy_action_change_sensitivity_flags (action, SENS_FLAG, !up);
}
static void
@@ -3776,11 +3759,6 @@ setup_toolbar (EphyWindow *window)
G_CALLBACK (ephy_link_open), window);
action = gtk_action_group_get_action (priv->toolbar_action_group,
- "NavigationUp");
- g_signal_connect_swapped (action, "open-link",
- G_CALLBACK (ephy_link_open), window);
-
- action = gtk_action_group_get_action (priv->toolbar_action_group,
"Location");
g_signal_connect (action, "notify::address",
G_CALLBACK (sync_user_input_cb), window);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]