From e9f71a186c58b10b6f2c8aa1fb324fabaae56f2d Mon Sep 17 00:00:00 2001 From: "dveditz%cruzio.com" Date: Fri, 14 Oct 2005 23:41:04 +0000 Subject: [PATCH] bug 282955 (back as bug 312426) locationbar-less mac window needs titleseparator r=neil.parkwaycc,sr=bzbarsky,a=mscott git-svn-id: svn://10.0.0.236/trunk@182283 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp index fd9b6f9a2ae..8b5e8661b7d 100644 --- a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp +++ b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp @@ -599,7 +599,8 @@ NS_IMETHODIMP nsContentTreeOwner::SetTitle(const PRUnichar* aTitle) title = docTitle; } - title += mTitleSeparator + mWindowTitleModifier; + if (!mWindowTitleModifier.IsEmpty()) + title += mTitleSeparator + mWindowTitleModifier; } else title.Assign(mWindowTitleModifier); // Title will just be plain "Mozilla" @@ -697,9 +698,8 @@ void nsContentTreeOwner::XULWindow(nsXULWindow* aXULWindow) mTitleDefault = mWindowTitleModifier; mWindowTitleModifier.Truncate(); } -#else - docShellElement->GetAttribute(NS_LITERAL_STRING("titlemenuseparator"), mTitleSeparator); #endif + docShellElement->GetAttribute(NS_LITERAL_STRING("titlemenuseparator"), mTitleSeparator); } } else