I failed to merge this hunk correctly last time :-[ b=104532 r=danm sr=jst a=asa

xpfe/appshell/src/nsContentTreeOwner.cpp

@@ -359,6 +359,10 @@ nsContentTreeOwner::GetPersistence(PRBool* aPersistPosition,
 
 NS_IMETHODIMP nsContentTreeOwner::SetStatus(PRUint32 aStatusType, const PRUnichar* aStatus)
 {
+  // We only allow the status to be set from the primary content shell
+  if (!mPrimary)
+    return NS_OK;
+  
   nsCOMPtr<nsIXULBrowserWindow> xulBrowserWindow;
   mXULWindow->GetXULBrowserWindow(getter_AddRefs(xulBrowserWindow));