Cleanup new tab logic, and ever use window for new instances.

2003-05-21  Marco Pesenti Gritti  <marco@it.gnome.org>

	* src/bookmarks/ephy-bookmarks-editor.c:
	(cmd_open_bookmarks_in_tabs),
	(ephy_bookmarks_editor_node_activated_cb):
	* src/ephy-automation.c: (impl_ephy_automation_loadurl):
	* src/ephy-history-window.c: (cmd_open_bookmarks_in_tabs),
	(cmd_open_bookmarks_in_browser):
	* src/ephy-notebook.c: (notebook_drag_data_received_cb):
	* src/ephy-shell.c: (ephy_shell_new_tab):
	* src/ephy-shell.h:
	* src/popup-commands.c: (popup_cmd_link_in_new_window),
	(popup_cmd_link_in_new_tab), (popup_cmd_image_in_new_tab),
	(popup_cmd_image_in_new_window), (popup_cmd_frame_in_new_tab),
	(popup_cmd_frame_in_new_window):
	* src/window-commands.c: (window_cmd_file_new_window),
	(window_cmd_file_new_tab), (window_cmd_view_page_source):

	Cleanup new tab logic, and ever use window for new instances.

1 files changed, 9 insertions, 13 deletions

diff --git a/src/ephy-automation.c b/src/ephy-automation.c
index 93573e924..96ed5f2d3 100644
--- a/src/ephy-automation.c
+++ b/src/ephy-automation.c
@@ -90,8 +90,7 @@ impl_ephy_automation_loadurl (PortableServer_Servant _servant,
 			      const CORBA_boolean raise,
                               CORBA_Environment * ev)
 {
-	EphyNewTabFlags flags;
-	const char *load_page = NULL;
+	EphyNewTabFlags flags = 0;
 	EphyWindow *window;
 	Session *session;
 
@@ -115,33 +114,30 @@ impl_ephy_automation_loadurl (PortableServer_Servant _servant,
 		return;
 	}
 
-	flags = EPHY_NEW_TAB_RAISE_WINDOW;
-
 	if (*url == '\0')
 	{
-		flags |= EPHY_NEW_TAB_HOMEPAGE;
+		flags |= EPHY_NEW_TAB_HOME_PAGE;
 	}
 	else
 	{
-		load_page = url;
-	}
-
-	if (open_in_new_window)
-	{
-		flags |= EPHY_NEW_TAB_IN_NEW_WINDOW;
+		flags |= EPHY_NEW_TAB_NEW_PAGE;
 	}
 
 	if (open_in_new_tab)
 	{
 		flags |= EPHY_NEW_TAB_IN_EXISTING_WINDOW;
 	}
+	else
+	{
+		flags |= EPHY_NEW_TAB_IN_NEW_WINDOW;
+	}
 
 	if (fullscreen)
 	{
-		flags |= EPHY_NEW_TAB_FULLSCREEN;
+		flags |= EPHY_NEW_TAB_FULLSCREEN_MODE;
 	}
 
-	ephy_shell_new_tab (ephy_shell, window, NULL, load_page,
+	ephy_shell_new_tab (ephy_shell, window, NULL, url,
 			    flags);
 }