Index: src/ephy-tab.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/ephy-tab.c,v
retrieving revision 1.80
diff -u -p -r1.80 ephy-tab.c
--- src/ephy-tab.c	12 Jan 2004 19:33:03 -0000	1.80
+++ src/ephy-tab.c	16 Jan 2004 21:58:24 -0000
@@ -879,8 +879,15 @@ ephy_tab_new_window_cb (EphyEmbed *embed
 	EphyTab *new_tab;
 	EphyWindow *window;
 
-	window = ephy_window_new ();
-	ephy_window_request_chrome (window, chromemask);
+	if (eel_gconf_get_boolean (CONF_LOCKDOWN_ALWAYS_OPEN_IN_TAB))
+	{
+		window = ephy_tab_get_window (tab);
+	}
+	else
+	{
+		window = ephy_window_new ();
+		ephy_window_request_chrome (window, chromemask);
+	}
 
 	new_tab = ephy_tab_new ();
         ephy_window_add_tab (window, new_tab, EPHY_NOTEBOOK_INSERT_GROUPED, FALSE);
Index: lib/ephy-prefs.h
===================================================================
RCS file: /cvs/gnome/epiphany/lib/ephy-prefs.h,v
retrieving revision 1.26
diff -u -p -r1.26 ephy-prefs.h
--- lib/ephy-prefs.h	10 Jan 2004 21:59:24 -0000	1.26
+++ lib/ephy-prefs.h	16 Jan 2004 21:58:24 -0000
@@ -48,7 +48,8 @@ G_BEGIN_DECLS
 #define CONF_LOCKDOWN_DISABLE_BOOKMARK_EDITING  "/apps/epiphany/lockdown/disable_bookmark_editing"
 #define CONF_LOCKDOWN_DISABLE_TOOLBAR_EDITING	"/apps/epiphany/lockdown/disable_toolbar_editing"
 #define CONF_LOCKDOWN_DISABLE_HISTORY		"/apps/epiphany/lockdown/disable_history"
+#define CONF_LOCKDOWN_ALWAYS_OPEN_IN_TAB	"/apps/epiphany/lockdown/always_open_in_tab"
 #define CONF_LOCKDOWN_DISABLE_SAVE_TO_DISK	"/desktop/gnome/lockdown/disable_save_to_disk"
 #define CONF_LOCKDOWN_DISABLE_PRINTING		"/desktop/gnome/lockdown/disable_printing"
 #define CONF_LOCKDOWN_DISABLE_PRINT_SETUP	"/desktop/gnome/lockdown/disable_print_setup"
 #define CONF_LOCKDOWN_DISABLE_COMMAND_LINE	"/desktop/gnome/lockdown/disable_command_line"
