data/ui/epiphany-toolbar.xml.in data/ui/epiphany-ui.xml.in

2003-02-16  Dave Bordoley <bordoley@msu.edu>

	* data/ui/epiphany-toolbar.xml.in
	* data/ui/epiphany-ui.xml.in
	* src/ephy-window.c
	* src/popup-commands.c
	* src/popup-commands.h
	* src/window-commands.c
	* src/window-commands.h
	s/browser/window as per conversation with seth...

8 files changed, 41 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index 30182f727..e5dc1bd07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-02-16  Dave Bordoley <bordoley@msu.edu>
+
+	* data/ui/epiphany-toolbar.xml.in
+	* data/ui/epiphany-ui.xml.in
+	* src/ephy-window.c
+	* src/popup-commands.c
+	* src/popup-commands.h
+	* src/window-commands.c
+	* src/window-commands.h
+	s/browser/window as per conversation with seth...
+
 2003-02-15  Marco Pesenti Gritti  <marco@it.gnome.org>
 
 	* embed/mozilla/EventContext.cpp:
diff --git a/data/ui/epiphany-toolbar.xml.in b/data/ui/epiphany-toolbar.xml.in
index cd9e48650..ef98ceb0d 100644
--- a/data/ui/epiphany-toolbar.xml.in
+++ b/data/ui/epiphany-toolbar.xml.in
@@ -9,7 +9,7 @@
 	<toolitem verb="GoHistory"/>
 	<toolitem verb="GoBookmarks"/>
 	<toolitem verb="FileNewTab"/>
-	<toolitem verb="FileNewBrowser"/>
+	<toolitem verb="FileNewWindow"/>
 	<toolitem verb="FileOpen"/>
 	<toolitem verb="FileSaveAs"/>
 	<toolitem verb="FilePrint"/>
diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in
index e1ced423a..04009d3c7 100644
--- a/data/ui/epiphany-ui.xml.in
+++ b/data/ui/epiphany-ui.xml.in
@@ -1,7 +1,7 @@
 <Root>
 <menu>
 <submenu name="FileMenu" verb="File">  
-        <menuitem name="FileNewBrowserMenu" verb="FileNewBrowser"/>
+        <menuitem name="FileNewWindowMenu" verb="FileNewWindow"/>
 	<menuitem name="FileNewTabMenu" verb="FileNewTab"/>
 	<menuitem name="FileOpenMenu" verb="FileOpen"/>
 	<separator name="FileSep1"/>	
@@ -12,7 +12,7 @@
 	<separator name="FileSep3"/>
 	<menuitem name="FileBookmarkPageMenu" verb="FileBookmarkPage"/>
 	<separator name="FileSep4"/>
-	<menuitem name="FileCloseBrowserMenu" verb="FileCloseBrowser"/>
+	<menuitem name="FileCloseWindowMenu" verb="FileCloseWindow"/>
 </submenu>
 
 <submenu name="EditMenu" verb="Edit">
@@ -108,13 +108,13 @@
 	<menuitem name="CopyPageLocationFDP" verb="CopyPageLocation"/>
 	<separator name="FDBSep2"/>
 	<menuitem name="OpenFrameFDP" verb="OpenFrame"/>
-	<menuitem name="OpenFrameInNewBrowserFDP" verb="OpenFrameInNewBrowser"/>
+	<menuitem name="OpenFrameInNewWindowFDP" verb="OpenFrameInNewWindow"/>
 	<menuitem name="OpenFrameInNewTabFDP" verb="OpenFrameInNewTab"/>
 </popup>
 
 <popup name="EphyLinkPopup" verb="FakeToplevel">
 	<menuitem name="OpenLinkLP" verb="OpenLink"/>
-        <menuitem name="OpenLinkInNewBrowserLP" verb="OpenLinkInNewBrowser"/>
+        <menuitem name="OpenLinkInNewWindowLP" verb="OpenLinkInNewWindow"/>
 	<menuitem name="OpenLinkInNewTabLP" verb="OpenLinkInNewTab"/>
 	<separator name="LPSep1"/>
 	<menuitem name="DownloadLinkLP" verb="DownloadLink"/>
@@ -125,7 +125,7 @@
 
 <popup name="EphyImagePopup" verb="FakeToplevel">
 	<menuitem name="OpenImageIP" verb="OpenImage"/>
-	<menuitem name="OpenImageInNewBrowserIP" verb="OpenImageInNewBrowser"/>
+	<menuitem name="OpenImageInNewWindowIP" verb="OpenImageInNewWindow"/>
 	<menuitem name="OpenImageInNewTabIP" verb="OpenImageInNewTab"/>
 	<separator name="IPSep1"/>
 	<menuitem name="SaveImageAsIP" verb="SaveImageAs"/>
@@ -135,7 +135,7 @@
 
 <popup name="EphyImageLinkPopup" verb="FakeToplevel">
 	<menuitem name="OpenLinkILP" verb="OpenLink"/>
-        <menuitem name="OpenLinkInNewBrowserILP" verb="OpenLinkInNewBrowser"/>
+        <menuitem name="OpenLinkInNewWindowILP" verb="OpenLinkInNewWindow"/>
 	<menuitem name="OpenLinkInNewTabILP" verb="OpenLinkInNewTab"/>
 	<separator name="ILPSep1"/>
 	<menuitem name="DownloadLinkILP" verb="DownloadLink"/>
@@ -144,7 +144,7 @@
 	<menuitem name="CopyEmailLinkILP" verb="CopyEmail"/>
 	<separator name="ILPSep2"/>
 	<menuitem name="OpenImageILP" verb="OpenImage"/>
-	<menuitem name="OpenImageInNewBrowserILP" verb="OpenImageInNewBrowser"/>
+	<menuitem name="OpenImageInNewWindowILP" verb="OpenImageInNewWindow"/>
 	<menuitem name="OpenImageInNewTabILP" verb="OpenImageInNewTab"/>
 	<separator name="ILPSep3"/>
 	<menuitem name="SaveImageAsILP" verb="SaveImageAs"/>
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 904dfc149..b58feb5d1 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -63,9 +63,9 @@ static EggActionGroupEntry ephy_menu_entries [] = {
 	{ "Help", N_("_Help"), NULL, NULL, NULL, NULL, NULL },
 
 	/* File menu */
-	{ "FileNewBrowser", N_("_New Browser"), GTK_STOCK_NEW, "<control>N",
-	  N_("Create a new browser"),
-	  G_CALLBACK (window_cmd_file_new_browser), NULL },
+	{ "FileNewWindow", N_("_New Window"), GTK_STOCK_NEW, "<control>N",
+	  N_("Create a new window"),
+	  G_CALLBACK (window_cmd_file_new_window), NULL },
 	{ "FileNewTab", N_("New _Tab"), EPHY_STOCK_NEW_TAB, "<control>T",
 	  N_("Create a new tab"),
 	  G_CALLBACK (window_cmd_file_new_tab), NULL },
@@ -84,9 +84,9 @@ static EggActionGroupEntry ephy_menu_entries [] = {
 	{ "FileBookmarkPage", N_("Boo_kmark Page..."), NULL, "<control>D",
 	  N_("Add a bookmark for the current page"),
 	  G_CALLBACK (window_cmd_file_bookmark_page), NULL },
-	{ "FileCloseBrowser", N_("_Close"), GTK_STOCK_CLOSE, "<control>W",
-	  N_("Close this browser"),
-	  G_CALLBACK (window_cmd_file_close_browser), NULL },
+	{ "FileCloseWindow", N_("_Close"), GTK_STOCK_CLOSE, "<control>W",
+	  N_("Close this window"),
+	  G_CALLBACK (window_cmd_file_close_window), NULL },
 
 	/* Edit menu */
 	{ "EditCut", N_("Cu_t"), GTK_STOCK_CUT, "<control>X",
@@ -218,16 +218,16 @@ static EggActionGroupEntry ephy_popups_entries [] = {
 	/* Framed document */
 	{ "OpenFrame", N_("_Open Frame"), NULL, NULL,
 	  NULL, G_CALLBACK (popup_cmd_open_frame), NULL },
-	{ "OpenFrameInNewBrowser", N_("Open Frame in _New Browser"), NULL, NULL,
-	  NULL, G_CALLBACK (popup_cmd_frame_in_new_browser), NULL },
+	{ "OpenFrameInNewWindow", N_("Open Frame in _New Window"), NULL, NULL,
+	  NULL, G_CALLBACK (popup_cmd_frame_in_new_window), NULL },
 	{ "OpenFrameInNewTab", N_("Open Frame in New _Tab"), NULL, NULL,
 	  NULL, G_CALLBACK (popup_cmd_frame_in_new_tab), NULL },
 
 	/* Links */
 	{ "OpenLink", N_("_Open Link"), GTK_STOCK_OPEN, NULL,
 	  NULL, G_CALLBACK (popup_cmd_open_link), NULL },
-	{ "OpenLinkInNewBrowser", N_("Open Link in _New Browser"), NULL, NULL,
-	  NULL, G_CALLBACK (popup_cmd_link_in_new_browser), NULL },
+	{ "OpenLinkInNewWindow", N_("Open Link in _New Window"), NULL, NULL,
+	  NULL, G_CALLBACK (popup_cmd_link_in_new_window), NULL },
 	{ "OpenLinkInNewTab", N_("Open Link in New _Tab"), NULL, NULL,
 	  NULL, G_CALLBACK (popup_cmd_link_in_new_tab), NULL },
 	{ "DownloadLink", N_("_Download Link"), GTK_STOCK_SAVE, NULL,
@@ -242,8 +242,8 @@ static EggActionGroupEntry ephy_popups_entries [] = {
 	/* Images */
 	{ "OpenImage", N_("_Open Image"), GTK_STOCK_OPEN, NULL,
 	  NULL, G_CALLBACK (popup_cmd_open_image), NULL },
-	{ "OpenImageInNewBrowser", N_("Open Image in _New Browser"), NULL, NULL,
-	  NULL, G_CALLBACK (popup_cmd_image_in_new_browser), NULL },
+	{ "OpenImageInNewWindow", N_("Open Image in _New Window"), NULL, NULL,
+	  NULL, G_CALLBACK (popup_cmd_image_in_new_window), NULL },
 	{ "OpenImageInNewTab", N_("Open Image in New _Tab"), NULL, NULL,
 	  NULL, G_CALLBACK (popup_cmd_image_in_new_tab), NULL },
 	{ "SaveImageAs", N_("_Save Image As..."), GTK_STOCK_SAVE_AS, NULL,
diff --git a/src/popup-commands.c b/src/popup-commands.c
index fa75ef8ce..1188f0573 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -43,7 +43,7 @@ get_event_info (EphyWindow *window)
 }
 
 void
-popup_cmd_link_in_new_browser (EggAction *action,
+popup_cmd_link_in_new_window (EggAction *action,
 		              EphyWindow *window)
 {
 	EphyEmbedEvent *info;
@@ -100,7 +100,7 @@ popup_cmd_image_in_new_tab (EggAction *action,
 }
 
 void
-popup_cmd_image_in_new_browser (EggAction *action,
+popup_cmd_image_in_new_window (EggAction *action,
 			       EphyWindow *window)
 {
 	EphyEmbedEvent *info;
@@ -188,7 +188,7 @@ popup_cmd_frame_in_new_tab (EggAction *action,
 }
 
 void
-popup_cmd_frame_in_new_browser (EggAction *action,
+popup_cmd_frame_in_new_window (EggAction *action,
 			       EphyWindow *window)
 {
 	EphyTab *tab;
diff --git a/src/popup-commands.h b/src/popup-commands.h
index af41756c5..5ec17215a 100644
--- a/src/popup-commands.h
+++ b/src/popup-commands.h
@@ -19,7 +19,7 @@
 #include "egg-action.h"
 #include "ephy-window.h"
 
-void popup_cmd_link_in_new_browser		(EggAction *action,
+void popup_cmd_link_in_new_window		(EggAction *action,
 					 EphyWindow *window);
 
 void popup_cmd_link_in_new_tab		(EggAction *action,
@@ -28,7 +28,7 @@ void popup_cmd_link_in_new_tab		(EggAction *action,
 void popup_cmd_image_in_new_tab		(EggAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_image_in_new_browser	(EggAction *action,
+void popup_cmd_image_in_new_window	(EggAction *action,
 					 EphyWindow *window);
 
 void popup_cmd_bookmark_link	(EggAction *action,
@@ -37,7 +37,7 @@ void popup_cmd_bookmark_link	(EggAction *action,
 void popup_cmd_frame_in_new_tab		(EggAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_frame_in_new_browser	(EggAction *action,
+void popup_cmd_frame_in_new_window	(EggAction *action,
 					 EphyWindow *window);
 
 void popup_cmd_add_frame_bookmark	(EggAction *action,
diff --git a/src/window-commands.c b/src/window-commands.c
index d03b4438e..c5ea747a3 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -222,7 +222,7 @@ window_cmd_view_reload (EggAction *action,
 }
 
 void
-window_cmd_file_new_browser (EggAction *action,
+window_cmd_file_new_window (EggAction *action,
 		            EphyWindow *window)
 {
 	EphyTab *tab;
@@ -374,7 +374,7 @@ window_cmd_file_save_as (EggAction *action,
 }
 
 void
-window_cmd_file_close_browser (EggAction *action,
+window_cmd_file_close_window (EggAction *action,
 		               EphyWindow *window)
 {
 	EphyTab *tab;
diff --git a/src/window-commands.h b/src/window-commands.h
index aa1b6a2e7..960ed9ee9 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -56,7 +56,7 @@ void window_cmd_view_reload	(EggAction *action,
 void window_cmd_new		(EggAction *action,
 				 EphyWindow *window);
 
-void window_cmd_file_new_browser	(EggAction *action,
+void window_cmd_file_new_window	(EggAction *action,
 				 EphyWindow *window);
 
 void window_cmd_file_new_tab	(EggAction *action,
@@ -77,7 +77,7 @@ void window_cmd_file_save_as    (EggAction *action,
 void window_cmd_file_send_to	(EggAction *action,
 				 EphyWindow *window);
 
-void window_cmd_file_close_browser (EggAction *action,
+void window_cmd_file_close_window (EggAction *action,
 				    EphyWindow *window);
 
 void window_cmd_edit_cut	(EggAction *action,