aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorXan Lopez <xan@gnome.org>2010-05-18 03:27:13 +0800
committerXan Lopez <xan@gnome.org>2010-05-19 00:08:47 +0800
commit0a3189127756d119ae87a3af8893e35161fcde8c (patch)
tree8ce485e66c505def1c62a65712abebe93c6ead28 /src
parent088c3a656727a6229b82f739f4b54f07f9a4641c (diff)
downloadgsoc2013-epiphany-0a3189127756d119ae87a3af8893e35161fcde8c.tar
gsoc2013-epiphany-0a3189127756d119ae87a3af8893e35161fcde8c.tar.gz
gsoc2013-epiphany-0a3189127756d119ae87a3af8893e35161fcde8c.tar.bz2
gsoc2013-epiphany-0a3189127756d119ae87a3af8893e35161fcde8c.tar.lz
gsoc2013-epiphany-0a3189127756d119ae87a3af8893e35161fcde8c.tar.xz
gsoc2013-epiphany-0a3189127756d119ae87a3af8893e35161fcde8c.tar.zst
gsoc2013-epiphany-0a3189127756d119ae87a3af8893e35161fcde8c.zip
Do not create statusbar messages for navigation actions
They are not very useful and add clutter to the UI.
Diffstat (limited to 'src')
-rw-r--r--src/ephy-navigation-action.c13
-rw-r--r--src/ephy-navigation-history-action.c50
-rw-r--r--src/ephy-navigation-up-action.c45
3 files changed, 1 insertions, 107 deletions
diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c
index 943126fbf..b4055393e 100644
--- a/src/ephy-navigation-action.c
+++ b/src/ephy-navigation-action.c
@@ -136,18 +136,7 @@ ephy_navigation_action_set_property (GObject *object,
g_object_notify (object, "tooltip");
break;
case PROP_WINDOW:
- {
- GtkWidget *statusbar;
-
- nav->priv->window = EPHY_WINDOW (g_value_get_object (value));
-
- /* statusbar context to display current selected item */
- statusbar = ephy_window_get_statusbar (nav->priv->window);
-
- nav->priv->statusbar_cid = gtk_statusbar_get_context_id (
- GTK_STATUSBAR (statusbar),
- "navigation_message");
- }
+ nav->priv->window = EPHY_WINDOW (g_value_get_object (value));
break;
}
}
diff --git a/src/ephy-navigation-history-action.c b/src/ephy-navigation-history-action.c
index b427cdfef..23aa874d5 100644
--- a/src/ephy-navigation-history-action.c
+++ b/src/ephy-navigation-history-action.c
@@ -182,50 +182,6 @@ activate_back_or_forward_menu_item_cb (GtkWidget *menuitem,
}
static void
-select_menu_item_cb (GtkWidget *menuitem,
- EphyNavigationHistoryAction *action)
-{
- WebKitWebHistoryItem *item;
-
- item = (WebKitWebHistoryItem*)g_object_get_data (G_OBJECT (menuitem),
- HISTORY_ITEM_DATA_KEY);
- if (item) {
- const char *url;
- EphyWindow *window;
- EphyNavigationAction *nav_action;
- GtkWidget *statusbar;
- guint statusbar_cid;
-
- url = webkit_web_history_item_get_uri (item);
- window = _ephy_navigation_action_get_window (EPHY_NAVIGATION_ACTION (action));
- statusbar = ephy_window_get_statusbar (window);
-
- /* Update status bar */
- nav_action = EPHY_NAVIGATION_ACTION (action);
- statusbar_cid = _ephy_navigation_action_get_statusbar_context_id (nav_action);
- gtk_statusbar_push (GTK_STATUSBAR (statusbar), statusbar_cid, url);
- }
-}
-
-static void
-deselect_menu_item_cb (GtkWidget *menuitem,
- EphyNavigationAction *action)
-{
- GtkWidget *statusbar;
- EphyWindow *window;
- EphyNavigationAction *nav_action;
- guint statusbar_cid;
-
- window = _ephy_navigation_action_get_window (EPHY_NAVIGATION_ACTION (action));
- statusbar = ephy_window_get_statusbar (window);
-
- /* Update status bar */
- nav_action = EPHY_NAVIGATION_ACTION (action);
- statusbar_cid = _ephy_navigation_action_get_statusbar_context_id (nav_action);
- gtk_statusbar_pop (GTK_STATUSBAR (statusbar), statusbar_cid);
-}
-
-static void
ephy_history_cleared_cb (EphyHistory *history,
EphyNavigationHistoryAction *action)
{
@@ -305,12 +261,6 @@ build_dropdown_menu (EphyNavigationAction *nav_action)
g_signal_connect (item, "activate",
G_CALLBACK (activate_back_or_forward_menu_item_cb),
action);
- g_signal_connect (item, "select",
- G_CALLBACK (select_menu_item_cb),
- action);
- g_signal_connect (item, "deselect",
- G_CALLBACK (deselect_menu_item_cb),
- action);
gtk_menu_shell_append (menu, item);
gtk_widget_show_all (item);
diff --git a/src/ephy-navigation-up-action.c b/src/ephy-navigation-up-action.c
index 8934a9efa..1c5a7cd0c 100644
--- a/src/ephy-navigation-up-action.c
+++ b/src/ephy-navigation-up-action.c
@@ -63,45 +63,6 @@ activate_up_menu_item_cb (GtkWidget *menuitem,
ephy_gui_is_middle_click () ? EPHY_LINK_NEW_TAB : 0);
}
-static void
-select_menu_item_cb (GtkWidget *menuitem,
- EphyNavigationUpAction *action)
-{
- const char *url;
- EphyWindow *window;
- EphyNavigationAction *nav_action;
- GtkWidget *statusbar;
- guint statusbar_cid;
-
- url = g_object_get_data (G_OBJECT (menuitem), URL_DATA_KEY);
- window = _ephy_navigation_action_get_window (EPHY_NAVIGATION_ACTION (action));
- statusbar = ephy_window_get_statusbar (window);
- g_return_if_fail (url != NULL);
-
- /* Update status bar */
- nav_action = EPHY_NAVIGATION_ACTION (action);
- statusbar_cid = _ephy_navigation_action_get_statusbar_context_id (nav_action);
- gtk_statusbar_push (GTK_STATUSBAR (statusbar), statusbar_cid, url);
-}
-
-static void
-deselect_menu_item_cb (GtkWidget *menuitem,
- EphyNavigationAction *action)
-{
- GtkWidget *statusbar;
- EphyWindow *window;
- EphyNavigationAction *nav_action;
- guint statusbar_cid;
-
- window = _ephy_navigation_action_get_window (EPHY_NAVIGATION_ACTION (action));
- statusbar = ephy_window_get_statusbar (window);
-
- /* Update status bar */
- nav_action = EPHY_NAVIGATION_ACTION (action);
- statusbar_cid = _ephy_navigation_action_get_statusbar_context_id (nav_action);
- gtk_statusbar_pop (GTK_STATUSBAR (statusbar), statusbar_cid);
-}
-
static GtkWidget *
build_dropdown_menu (EphyNavigationAction *nav_action)
{
@@ -142,12 +103,6 @@ build_dropdown_menu (EphyNavigationAction *nav_action)
(GDestroyNotify) g_free);
g_signal_connect (item, "activate",
G_CALLBACK (activate_up_menu_item_cb), action);
- g_signal_connect (item, "select",
- G_CALLBACK (select_menu_item_cb),
- action);
- g_signal_connect (item, "deselect",
- G_CALLBACK (deselect_menu_item_cb),
- action);
gtk_menu_shell_append (menu, item);
gtk_widget_show (item);