From 60293e52bf139ae8b7e667efb3ee6b8576298a12 Mon Sep 17 00:00:00 2001
From: Xan Lopez <xan@src.gnome.org>
Date: Sun, 15 Feb 2009 22:20:52 +0000
Subject: Add option to open new windows in tabs.

Only available as a gconf key for now,
/apps/epiphany/general/open_new_windows_in_tab.

Patch by Alejandro G. Castro.

Bug #571593

svn path=/trunk/; revision=8783
---
 src/ephy-window.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/ephy-window.c b/src/ephy-window.c
index dacaee3e0..f826ba74f 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2496,11 +2496,27 @@ create_web_view_cb (WebKitWebView *web_view,
 {
 	EphyEmbed *embed;
 	WebKitWebView *new_web_view;
+	EphyNewTabFlags flags;
+	EphyWindow *parent_window;
+
+	if (eel_gconf_get_boolean (CONF_INTERFACE_OPEN_NEW_WINDOWS_IN_TAB))
+	{
+		parent_window = window;
+		flags = EPHY_NEW_TAB_IN_EXISTING_WINDOW |
+			EPHY_NEW_TAB_JUMP;
+
+	}
+	else
+	{
+		parent_window = NULL;
+		flags = EPHY_NEW_TAB_IN_NEW_WINDOW |
+			EPHY_NEW_TAB_DONT_SHOW_WINDOW;
+	}
 
 	embed = ephy_shell_new_tab_full (ephy_shell_get_default (),
-					 NULL, NULL, NULL,
-					 EPHY_NEW_TAB_IN_NEW_WINDOW |
-					 EPHY_NEW_TAB_DONT_SHOW_WINDOW, 
+					 parent_window,
+					 NULL, NULL,
+					 flags,
 					 EPHY_EMBED_CHROME_ALL,
 					 FALSE,
 					 0);
-- 
cgit v1.2.3