From 5345b72acb0c01a0b43850af9e12c07005e195c8 Mon Sep 17 00:00:00 2001
From: "hwaara%gmail.com" <hwaara%gmail.com>
Date: Thu, 6 Jul 2006 11:57:12 +0000
Subject: [PATCH] Camino-branch bustage fix. nsIDOMPopupBlockedEvent.idl
 doesn't have the popupWindowName property on branch.  See bug 343734

---
 camino/src/browser/BrowserWindowController.mm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/camino/src/browser/BrowserWindowController.mm b/camino/src/browser/BrowserWindowController.mm
index cec967596e2..74bda3e3ebf 100644
--- a/camino/src/browser/BrowserWindowController.mm
+++ b/camino/src/browser/BrowserWindowController.mm
@@ -1649,10 +1649,17 @@ enum BWCOpenDest {
   aPopupBlockedEvent->GetRequestingWindowURI(getter_AddRefs(requestingWindowURI));
   aPopupBlockedEvent->GetPopupWindowURI(getter_AddRefs(popupWindowURI));
 
-  // get the blocked popup's modifiers, and window name
-  nsAutoString features, windowName;
-  aPopupBlockedEvent->GetPopupWindowFeatures(features);
+  nsAutoString windowName, features;
+  
+  // get the popup window's features
+  aPopupBlockedEvent->GetPopupWindowFeatures(features);  
+  
+#ifndef MOZILLA_1_8_BRANCH
+  // XXXhakan: nsIDOMPopupBlockedEvent didn't get the popupWindowName property added on branch, so
+  // we can't set the popup window's original name for now.
+  // see bug 343734
   aPopupBlockedEvent->GetPopupWindowName(windowName);
+#endif 
 
   // find the docshell for the blocked popup window, in order to show it
   nsCOMPtr<nsIDocShell> popupWinDocShell = [[mBrowserView getBrowserView] findDocShellForURI:requestingWindowURI];