aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-09-13 18:34:50 +0800
committerChristian Persch <chpe@src.gnome.org>2004-09-13 18:34:50 +0800
commit9ea59954b1c4c79acc545a13c4199aba2a8d66e6 (patch)
tree6179be4cb25071b42a7f1d8198c72dc521ff5bdc /src
parente7e430910c57ca4e9984b92739f77666ab19a775 (diff)
downloadgsoc2013-epiphany-9ea59954b1c4c79acc545a13c4199aba2a8d66e6.tar
gsoc2013-epiphany-9ea59954b1c4c79acc545a13c4199aba2a8d66e6.tar.gz
gsoc2013-epiphany-9ea59954b1c4c79acc545a13c4199aba2a8d66e6.tar.bz2
gsoc2013-epiphany-9ea59954b1c4c79acc545a13c4199aba2a8d66e6.tar.lz
gsoc2013-epiphany-9ea59954b1c4c79acc545a13c4199aba2a8d66e6.tar.xz
gsoc2013-epiphany-9ea59954b1c4c79acc545a13c4199aba2a8d66e6.tar.zst
gsoc2013-epiphany-9ea59954b1c4c79acc545a13c4199aba2a8d66e6.zip
Fix toolbar overflow menu handling. Fixes bug #151648.
2004-09-13 Christian Persch <chpe@cvs.gnome.org> * src/ephy-go-action.c: (connect_proxy): * src/ephy-navigation-action.c: (connect_proxy): Fix toolbar overflow menu handling. Fixes bug #151648.
Diffstat (limited to 'src')
-rw-r--r--src/ephy-go-action.c9
-rw-r--r--src/ephy-navigation-action.c7
2 files changed, 11 insertions, 5 deletions
diff --git a/src/ephy-go-action.c b/src/ephy-go-action.c
index bf8ec1d2f..449b85367 100644
--- a/src/ephy-go-action.c
+++ b/src/ephy-go-action.c
@@ -85,9 +85,12 @@ connect_proxy (GtkAction *action,
{
GTK_ACTION_CLASS (parent_class)->connect_proxy (action, proxy);
- g_signal_connect_object (GTK_BIN (proxy)->child, "clicked",
- G_CALLBACK (gtk_action_activate), action,
- G_CONNECT_SWAPPED);
+ if (GTK_IS_TOOL_ITEM (proxy))
+ {
+ g_signal_connect_object (GTK_BIN (proxy)->child, "clicked",
+ G_CALLBACK (gtk_action_activate), action,
+ G_CONNECT_SWAPPED);
+ }
}
static void
diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c
index 97987cd61..45f13d48e 100644
--- a/src/ephy-navigation-action.c
+++ b/src/ephy-navigation-action.c
@@ -284,8 +284,11 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
{
LOG ("Connect navigation action proxy")
- g_signal_connect (proxy, "menu-activated",
- G_CALLBACK (menu_activated_cb), action);
+ if (EPHY_IS_ARROW_TOOLBUTTON (proxy))
+ {
+ g_signal_connect (proxy, "menu-activated",
+ G_CALLBACK (menu_activated_cb), action);
+ }
(* GTK_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
}