From 32b7e2915272d770df992ce41cea961d2180953f Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 9 Feb 2003 21:32:17 +0000 Subject: Have just one Close menu item and make it behave like other gnome apps. 2003-02-09 Marco Pesenti Gritti * data/ui/epiphany-ui.xml.in: * src/ephy-window.c: * src/window-commands.c: (window_cmd_file_close_browser): * src/window-commands.h: Have just one Close menu item and make it behave like other gnome apps. --- src/ephy-window.c | 5 +---- src/window-commands.c | 11 ++--------- src/window-commands.h | 7 ++----- 3 files changed, 5 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/ephy-window.c b/src/ephy-window.c index 6cc3d3f6c..fb65e8e60 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -84,12 +84,9 @@ static EggActionGroupEntry ephy_menu_entries [] = { { "FileAddBookmark", N_("_Add Bookmark..."), GTK_STOCK_ADD, "D", N_("Add a bookmark for the current page"), G_CALLBACK (window_cmd_file_add_bookmark), NULL }, - { "FileCloseTab", N_("C_lose Tab"), GTK_STOCK_CLOSE, "W", - N_("Close the selected tab"), - G_CALLBACK (window_cmd_file_close_tab), NULL }, { "FileCloseBrowser", N_("_Close"), GTK_STOCK_CLOSE, "W", N_("Close this browser"), - G_CALLBACK (window_cmd_file_close_window), NULL }, + G_CALLBACK (window_cmd_file_close_browser), NULL }, /* Edit menu */ { "EditCut", N_("Cu_t"), GTK_STOCK_CUT, "X", diff --git a/src/window-commands.c b/src/window-commands.c index 2201d169c..a36307990 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -374,8 +374,8 @@ window_cmd_file_save_as (EggAction *action, } void -window_cmd_file_close_tab (EggAction *action, - EphyWindow *window) +window_cmd_file_close_browser (EggAction *action, + EphyWindow *window) { EphyTab *tab; @@ -385,13 +385,6 @@ window_cmd_file_close_tab (EggAction *action, ephy_window_remove_tab (window, tab); } -void -window_cmd_file_close_window (EggAction *action, - EphyWindow *window) -{ - gtk_widget_destroy (GTK_WIDGET(window)); -} - void window_cmd_edit_cut (EggAction *action, EphyWindow *window) diff --git a/src/window-commands.h b/src/window-commands.h index f7328113c..131d0f727 100644 --- a/src/window-commands.h +++ b/src/window-commands.h @@ -77,11 +77,8 @@ void window_cmd_file_save_as (EggAction *action, void window_cmd_file_send_to (EggAction *action, EphyWindow *window); -void window_cmd_file_close_tab (EggAction *action, - EphyWindow *window); - -void window_cmd_file_close_window (EggAction *action, - EphyWindow *window); +void window_cmd_file_close_browser (EggAction *action, + EphyWindow *window); void window_cmd_edit_cut (EggAction *action, EphyWindow *window); -- cgit v1.2.3