From 51302cc3eaa22ca0472e1bbdc02efcc8afe5dc2a Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk"
 <neil%parkwaycc.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 16 Oct 2004 20:26:22 +0000
Subject: [PATCH] Bug 261517 Groupmarks should always respect background
 preference (regression from bug 72361) p=trev@gtchat.de r+sr=me

git-svn-id: svn://10.0.0.236/trunk@163899 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../components/bookmarks/resources/bookmarks.js    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.js b/mozilla/xpfe/components/bookmarks/resources/bookmarks.js
index d45629e0d91..4f92580f065 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.js
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.js
@@ -72,6 +72,8 @@ var kDSContractID;
 var kDSIID;
 var DS;
 
+var gLoadInBackground = false;
+
 // should be moved in a separate file
 function initServices()
 {
@@ -563,10 +565,8 @@ var BookmarksCommand = {
       break;
     case "tab":
       var tab = browser.addTab(url);
-      browser.selectedTab = tab;
-      break;
-    case "tab_background":
-      browser.addTab(url);
+      if (!gLoadInBackground)
+        browser.selectedTab = tab;
       break;
     }
   },
@@ -598,7 +598,7 @@ var BookmarksCommand = {
     } else {
       var browser = w.getBrowser();
       var tab = browser.loadGroup(URIs);
-      if (aTargetBrowser != "tab_background")
+      if (!gLoadInBackground)
         browser.selectedTab = tab;
     }
   },
@@ -1593,6 +1593,8 @@ var BookmarksUtils = {
     if (!aEvent)
       return null;
 
+    gLoadInBackground = this.shouldLoadTabInBackground(aEvent);
+
     switch (aEvent.type) {
     case "click":
     case "dblclick":
@@ -1617,7 +1619,7 @@ var BookmarksUtils = {
     }
 
     if (PREF && PREF.getBoolPref("browser.tabs.opentabfor.middleclick"))
-      return this.shouldLoadTabInBackground(aEvent) ? "tab_background" : "tab";
+      return "tab";
 
     if (PREF && PREF.getBoolPref("middlemouse.openNewWindow"))
       return "window";