aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-02-05 00:36:15 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-02-05 00:36:15 +0800
commit3618cd422cdc8ea4228daf2a7f6b854a2bce4edb (patch)
tree306602e82ef16e1751fc860d5ff07bb418298b29 /src
parentc394fa6c682a336366e7645af1295b5ffad86835 (diff)
downloadgsoc2013-epiphany-3618cd422cdc8ea4228daf2a7f6b854a2bce4edb.tar
gsoc2013-epiphany-3618cd422cdc8ea4228daf2a7f6b854a2bce4edb.tar.gz
gsoc2013-epiphany-3618cd422cdc8ea4228daf2a7f6b854a2bce4edb.tar.bz2
gsoc2013-epiphany-3618cd422cdc8ea4228daf2a7f6b854a2bce4edb.tar.lz
gsoc2013-epiphany-3618cd422cdc8ea4228daf2a7f6b854a2bce4edb.tar.xz
gsoc2013-epiphany-3618cd422cdc8ea4228daf2a7f6b854a2bce4edb.tar.zst
gsoc2013-epiphany-3618cd422cdc8ea4228daf2a7f6b854a2bce4edb.zip
Fix several menu accels I borked when porting to egg. Connect drag source
2003-02-04 Marco Pesenti Gritti <marco@it.gnome.org> * lib/widgets/ephy-editable-toolbar.c: (item_node_new), (connect_drag_sources), (disconnect_drag_sources), (setup_toolbars), (do_merge), (ephy_editable_toolbar_init), (editor_close_cb), (ephy_editable_toolbar_edit): * src/ephy-favicon-action.c: (connect_proxy): * src/ephy-window.c: Fix several menu accels I borked when porting to egg. Connect drag source on toolbar buttons only when necessary, fix favicon drag.
Diffstat (limited to 'src')
-rw-r--r--src/ephy-favicon-action.c2
-rw-r--r--src/ephy-window.c16
2 files changed, 9 insertions, 9 deletions
diff --git a/src/ephy-favicon-action.c b/src/ephy-favicon-action.c
index 88103ac09..fd19516ea 100644
--- a/src/ephy-favicon-action.c
+++ b/src/ephy-favicon-action.c
@@ -157,7 +157,7 @@ static void
connect_proxy (EggAction *action, GtkWidget *proxy)
{
ephy_dnd_url_drag_source_set (proxy);
-
+ ephy_favicon_action_sync_icon (action, NULL, proxy);
g_signal_connect (proxy,
"drag_data_get",
G_CALLBACK (favicon_drag_data_get_cb),
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 97d3900ef..e902775dc 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -154,16 +154,16 @@ static EggActionGroupEntry ephy_menu_entries [] = {
G_CALLBACK (window_cmd_view_page_source), NULL },
/* Go menu */
- { "GoBack", N_("_Back"), GTK_STOCK_GO_BACK, "<alt>left",
+ { "GoBack", N_("_Back"), GTK_STOCK_GO_BACK, "<alt>leftarrow",
N_("Go to the previous visited page"),
G_CALLBACK (window_cmd_go_back), NULL },
- { "GoForward", N_("_Forward"), GTK_STOCK_GO_FORWARD, "<alt>right",
+ { "GoForward", N_("_Forward"), GTK_STOCK_GO_FORWARD, "<alt>rightarrow",
N_("Go to the next visited page"),
G_CALLBACK (window_cmd_go_forward), NULL },
- { "GoUp", N_("_Up"), GTK_STOCK_GO_UP, "<alt>up",
+ { "GoUp", N_("_Up"), GTK_STOCK_GO_UP, "<alt>uparrow",
N_("Go up one level"),
G_CALLBACK (window_cmd_go_up), NULL },
- { "GoHome", N_("_Home"), GTK_STOCK_HOME, "<alt>home",
+ { "GoHome", N_("_Home"), GTK_STOCK_HOME, "<alt>Home",
N_("Go to the home page"),
G_CALLBACK (window_cmd_go_home), NULL },
{ "GoLocation", N_("_Location..."), NULL, "<control>L",
@@ -177,16 +177,16 @@ static EggActionGroupEntry ephy_menu_entries [] = {
G_CALLBACK (window_cmd_go_bookmarks), NULL },
/* Tabs menu */
- { "TabsPrevious", N_("_Previous Tab"), NULL, "<control>page_up",
+ { "TabsPrevious", N_("_Previous Tab"), NULL, "<control>Page_Up",
N_("Activate previous tab"),
G_CALLBACK (window_cmd_tabs_previous), NULL },
- { "TabsNext", N_("_Next Tab"), NULL, "<control>page_down",
+ { "TabsNext", N_("_Next Tab"), NULL, "<control>Page_Down",
N_("Activate next tab"),
G_CALLBACK (window_cmd_tabs_next), NULL },
- { "TabsMoveLeft", N_("Move Tab _Left"), NULL, "<shift><control>page_up",
+ { "TabsMoveLeft", N_("Move Tab _Left"), NULL, "<shift><control>Page_Up",
N_("Move current tab to left"),
G_CALLBACK (window_cmd_tabs_move_left), NULL },
- { "TabsMoveRight", N_("Move Tab _Right"), NULL, "<shift><control>page_up",
+ { "TabsMoveRight", N_("Move Tab _Right"), NULL, "<shift><control>Page_Down",
N_("Move current tab to right"),
G_CALLBACK (window_cmd_tabs_move_right), NULL },
{ "TabsDetach", N_("_Detach Tab"), NULL, "<shift><control>M",