aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-01-22 20:32:55 +0800
committerXan Lopez <xan@igalia.com>2012-01-22 20:32:55 +0800
commit9d8acc22c843f9309e9f90ae23a58eeb4c064bde (patch)
treed2240098e7313a56d5389fe0c92772a9bf9ae542
parent7cdfd66e04647967f8c92fa1aa3d75fb489fd475 (diff)
downloadgsoc2013-epiphany-9d8acc22c843f9309e9f90ae23a58eeb4c064bde.tar
gsoc2013-epiphany-9d8acc22c843f9309e9f90ae23a58eeb4c064bde.tar.gz
gsoc2013-epiphany-9d8acc22c843f9309e9f90ae23a58eeb4c064bde.tar.bz2
gsoc2013-epiphany-9d8acc22c843f9309e9f90ae23a58eeb4c064bde.tar.lz
gsoc2013-epiphany-9d8acc22c843f9309e9f90ae23a58eeb4c064bde.tar.xz
gsoc2013-epiphany-9d8acc22c843f9309e9f90ae23a58eeb4c064bde.tar.zst
gsoc2013-epiphany-9d8acc22c843f9309e9f90ae23a58eeb4c064bde.zip
ephy-window: remove menu statusbar helper messages
They are not that helpful and are a bit distracting. https://bugzilla.gnome.org/show_bug.cgi?id=668191
-rw-r--r--src/ephy-window.c47
1 files changed, 2 insertions, 45 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c
index a37055be2..d8d44793b 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1349,35 +1349,6 @@ ephy_window_get_active_web_view (EphyWindow *window)
return ephy_embed_get_web_view (active_embed);
}
-static void
-menu_item_select_cb (GtkMenuItem *proxy,
- EphyWindow *window)
-{
- GtkAction *action;
- char *message;
-
- action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (proxy));
- g_return_if_fail (action != NULL);
-
- g_object_get (action, "tooltip", &message, NULL);
- if (message)
- {
- EphyWebView *view = ephy_window_get_active_web_view (window);
- ephy_embed_statusbar_push (EPHY_GET_EMBED_FROM_EPHY_WEB_VIEW (view),
- window->priv->help_message_cid, message);
- g_free (message);
- }
-}
-
-static void
-menu_item_deselect_cb (GtkMenuItem *proxy,
- EphyWindow *window)
-{
- EphyWebView *view = ephy_window_get_active_web_view (window);
- ephy_embed_statusbar_pop (EPHY_GET_EMBED_FROM_EPHY_WEB_VIEW (view),
- window->priv->help_message_cid);
-}
-
static gboolean
tool_item_enter_cb (GtkWidget *proxy,
GdkEventCrossing *event,
@@ -1479,14 +1450,7 @@ disconnect_proxy_cb (GtkUIManager *manager,
GtkWidget *proxy,
EphyWindow *window)
{
- if (GTK_IS_MENU_ITEM (proxy))
- {
- g_signal_handlers_disconnect_by_func
- (proxy, G_CALLBACK (menu_item_select_cb), window);
- g_signal_handlers_disconnect_by_func
- (proxy, G_CALLBACK (menu_item_deselect_cb), window);
- }
- else if (GTK_IS_TOOL_ITEM (proxy))
+ if (GTK_IS_TOOL_ITEM (proxy))
{
disconnect_tool_item (proxy, window);
}
@@ -1498,14 +1462,7 @@ connect_proxy_cb (GtkUIManager *manager,
GtkWidget *proxy,
EphyWindow *window)
{
- if (GTK_IS_MENU_ITEM (proxy))
- {
- g_signal_connect (proxy, "select",
- G_CALLBACK (menu_item_select_cb), window);
- g_signal_connect (proxy, "deselect",
- G_CALLBACK (menu_item_deselect_cb), window);
- }
- else if (GTK_IS_TOOL_ITEM (proxy))
+ if (GTK_IS_TOOL_ITEM (proxy))
{
connect_tool_item (proxy, window);
}