diff --git a/content/base/src/nsDocumentViewer.cpp b/content/base/src/nsDocumentViewer.cpp index 5476e8f706c6..a4c00712b0d1 100644 --- a/content/base/src/nsDocumentViewer.cpp +++ b/content/base/src/nsDocumentViewer.cpp @@ -541,7 +541,6 @@ public: enum eDocTitleDefault { eDocTitleDefNone, eDocTitleDefBlank, - eDocTitleDefDocument, eDocTitleDefURLDoc }; @@ -2995,9 +2994,6 @@ DocumentViewerImpl::GetDisplayTitleAndURL(PrintObject* aPO, case eDocTitleDefBlank: *aTitle = ToNewUnicode(NS_LITERAL_STRING("")); break; - case eDocTitleDefDocument: if (aBrandName) *aTitle = nsCRT::strdup(aBrandName); - break; - case eDocTitleDefURLDoc: if (*aURLStr) { *aTitle = nsCRT::strdup(*aURLStr); @@ -6653,7 +6649,7 @@ DocumentViewerImpl::SetDocAndURLIntoProgress(PrintObject* aPO, PRUnichar * docTitleStr; PRUnichar * docURLStr; GetDisplayTitleAndURL(aPO, mPrt->mPrintSettings, mPrt->mBrandName, - &docTitleStr, &docURLStr, eDocTitleDefDocument); + &docTitleStr, &docURLStr, eDocTitleDefURLDoc); // Make sure the URLS don't get too long for the progress dialog if (docURLStr && nsCRT::strlen(docURLStr) > kTitleLength) { diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp index 5476e8f706c6..a4c00712b0d1 100644 --- a/layout/base/nsDocumentViewer.cpp +++ b/layout/base/nsDocumentViewer.cpp @@ -541,7 +541,6 @@ public: enum eDocTitleDefault { eDocTitleDefNone, eDocTitleDefBlank, - eDocTitleDefDocument, eDocTitleDefURLDoc }; @@ -2995,9 +2994,6 @@ DocumentViewerImpl::GetDisplayTitleAndURL(PrintObject* aPO, case eDocTitleDefBlank: *aTitle = ToNewUnicode(NS_LITERAL_STRING("")); break; - case eDocTitleDefDocument: if (aBrandName) *aTitle = nsCRT::strdup(aBrandName); - break; - case eDocTitleDefURLDoc: if (*aURLStr) { *aTitle = nsCRT::strdup(*aURLStr); @@ -6653,7 +6649,7 @@ DocumentViewerImpl::SetDocAndURLIntoProgress(PrintObject* aPO, PRUnichar * docTitleStr; PRUnichar * docURLStr; GetDisplayTitleAndURL(aPO, mPrt->mPrintSettings, mPrt->mBrandName, - &docTitleStr, &docURLStr, eDocTitleDefDocument); + &docTitleStr, &docURLStr, eDocTitleDefURLDoc); // Make sure the URLS don't get too long for the progress dialog if (docURLStr && nsCRT::strlen(docURLStr) > kTitleLength) { diff --git a/xpfe/global/resources/content/printProgress.js b/xpfe/global/resources/content/printProgress.js index 96f7216fa696..cf13bcd6d806 100644 --- a/xpfe/global/resources/content/printProgress.js +++ b/xpfe/global/resources/content/printProgress.js @@ -73,13 +73,15 @@ var progressListener = { { var docTitleStr = progressParams.docTitle; if (docTitleStr != docTitle) { - SetTitle(docTitleStr); docTitle = docTitleStr; + dialog.status.value = docTitle; } var docURLStr = progressParams.docURL; if (docURLStr != docURL && dialog.status != null) { - dialog.status.value = docURLStr; docURL = docURLStr; + if (docTitle == "") { + dialog.status.value = docURLStr; + } } } @@ -195,7 +197,7 @@ function onLoad() { dialog.progressText = document.getElementById("dialog.progressText"); dialog.cancel = document.getElementById("cancel"); - dialog.status.value = docURL; + dialog.status.value = docTitle; // Set up dialog button callbacks. var object = this; @@ -207,9 +209,6 @@ function onLoad() { // set our web progress listener on the helper app launcher printProgress.registerListener(progressListener); moveToAlertPosition(); - - //We need to delay the set title else dom will overwrite it - window.setTimeout(SetTitle, 0, docTitle); } function onUnload() @@ -226,12 +225,6 @@ function onUnload() } } -function SetTitle(str) -{ - var prefix = getString("titlePrefixPrint"); - window.title = prefix + " " + str; -} - // If the user presses cancel, tell the app launcher and close the dialog... function onCancel () { diff --git a/xpfe/global/resources/content/printProgress.xul b/xpfe/global/resources/content/printProgress.xul index 433894f72454..3f1e672dd4b9 100644 --- a/xpfe/global/resources/content/printProgress.xul +++ b/xpfe/global/resources/content/printProgress.xul @@ -48,7 +48,6 @@ Contributor(s): --> &dialogClose.label; - &titlePrefixPrint; &printComplete; &percentPrint; diff --git a/xpfe/global/resources/locale/en-US/printProgress.dtd b/xpfe/global/resources/locale/en-US/printProgress.dtd index cba0f3e04b4f..3f30a22cbd5e 100644 --- a/xpfe/global/resources/locale/en-US/printProgress.dtd +++ b/xpfe/global/resources/locale/en-US/printProgress.dtd @@ -1,7 +1,6 @@ - - +