Have just one Close menu item and make it behave like other gnome apps.

2003-02-09  Marco Pesenti Gritti  <marco@it.gnome.org>

	* 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.

5 files changed, 15 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index e0d3d5b14..d322c8fa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2003-02-09  Marco Pesenti Gritti  <marco@it.gnome.org>
 
+	* 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.
+
+2003-02-09  Marco Pesenti Gritti  <marco@it.gnome.org>
+
 	* acconfig.h:
 	* configure.in:
 	* data/GNOME_Epiphany_NautilusView.server.in:
diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in
index b9875b411..c8f5fe8de 100644
--- a/data/ui/epiphany-ui.xml.in
+++ b/data/ui/epiphany-ui.xml.in
@@ -12,7 +12,6 @@
 	<separator name="FileSep3"/>
 	<menuitem name="FileAddBookmarkMenu" verb="FileAddBookmark"/>
 	<separator name="FileSep4"/>
-	<menuitem name="FileCloseTabMenu" verb="FileCloseTab"/>
 	<menuitem name="FileCloseBrowserMenu" verb="FileCloseBrowser"/>
 </submenu>
 
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, "<control>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, "<shift><control>W",
-	  N_("Close the selected tab"),
-	  G_CALLBACK (window_cmd_file_close_tab), NULL },
 	{ "FileCloseBrowser", N_("_Close"), GTK_STOCK_CLOSE, "<control>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, "<control>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;
 
@@ -386,13 +386,6 @@ window_cmd_file_close_tab (EggAction *action,
 }
 
 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);