Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make defaultDescription and applicationDescription use the handler's leafname

Browse Source 
if no description is set.  Bug 190409, r=pkw@us.ibm.com, sr=darin


git-svn-id: svn://10.0.0.236/trunk@138226 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2003-02-22 20:06:56 +00:00
parent 8bd449bb27
commit 4b5837cdf9
3 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/embedding/components/ui/helperAppDlg/nsHelperAppDlg.js
View File

@@ -384,15 +384,8 @@ nsHelperAppDialog.prototype = {
// Set "default" application description field.
initDefaultApp: function() {
// Use description, if provided.
// Use description, if we can get one.
var desc = this.mLauncher.MIMEInfo.defaultDescription;
if ( !desc ) {
// Otherwise, use helper application file name
var app = this.mLauncher.MIMEInfo.defaultApplicationHandler;
if ( app ) {
desc = app.leafName;
}
}
if ( desc ) {
this.dialogElement( "useSystemDefault" ).label = this.replaceInsert( this.getString( "defaultApp" ), 1, desc );
}
@@ -538,7 +531,7 @@ nsHelperAppDialog.prototype = {
// App may have changed - Update application and description
var app = this.helperAppChoice();
this.mLauncher.MIMEInfo.preferredApplicationHandler = app;
this.mLauncher.MIMEInfo.applicationDescription = app.leafName;
this.mLauncher.MIMEInfo.applicationDescription = "";
}
}
// We will also need to update if the "always ask" flag has changed.

26
mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp
View File

@@ -273,8 +273,17 @@ NS_IMETHODIMP nsMIMEInfoImpl::SetFileExtensions( const char* aExtensions )
NS_IMETHODIMP nsMIMEInfoImpl::GetApplicationDescription(PRUnichar ** aApplicationDescription)
{
*aApplicationDescription = ToNewUnicode(mPreferredAppDescription);
return NS_OK;
if (mPreferredAppDescription.IsEmpty() && mPreferredApplication) {
// Don't want to cache this, just in case someone resets the app
// without changing the description....
nsAutoString leafName;
mPreferredApplication->GetLeafName(leafName);
*aApplicationDescription = ToNewUnicode(leafName);
} else {
*aApplicationDescription = ToNewUnicode(mPreferredAppDescription);
}
return *aApplicationDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
}
NS_IMETHODIMP nsMIMEInfoImpl::SetApplicationDescription(const PRUnichar * aApplicationDescription)
@@ -285,8 +294,17 @@ NS_IMETHODIMP nsMIMEInfoImpl::SetApplicationDescription(const PRUnichar * aAppli
NS_IMETHODIMP nsMIMEInfoImpl::GetDefaultDescription(PRUnichar ** aDefaultDescription)
{
*aDefaultDescription = ToNewUnicode(mDefaultAppDescription);
return NS_OK;
if (mDefaultAppDescription.IsEmpty() && mDefaultApplication) {
// Don't want to cache this, just in case someone resets the app
// without changing the description....
nsAutoString leafName;
mDefaultApplication->GetLeafName(leafName);
*aDefaultDescription = ToNewUnicode(leafName);
} else {
*aDefaultDescription = ToNewUnicode(mDefaultAppDescription);
}
return *aDefaultDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
}
NS_IMETHODIMP nsMIMEInfoImpl::SetDefaultDescription(const PRUnichar * aDefaultDescription)

26
mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp
View File

@@ -273,8 +273,17 @@ NS_IMETHODIMP nsMIMEInfoImpl::SetFileExtensions( const char* aExtensions )
NS_IMETHODIMP nsMIMEInfoImpl::GetApplicationDescription(PRUnichar ** aApplicationDescription)
{
*aApplicationDescription = ToNewUnicode(mPreferredAppDescription);
return NS_OK;
if (mPreferredAppDescription.IsEmpty() && mPreferredApplication) {
// Don't want to cache this, just in case someone resets the app
// without changing the description....
nsAutoString leafName;
mPreferredApplication->GetLeafName(leafName);
*aApplicationDescription = ToNewUnicode(leafName);
} else {
*aApplicationDescription = ToNewUnicode(mPreferredAppDescription);
}
return *aApplicationDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
}
NS_IMETHODIMP nsMIMEInfoImpl::SetApplicationDescription(const PRUnichar * aApplicationDescription)
@@ -285,8 +294,17 @@ NS_IMETHODIMP nsMIMEInfoImpl::SetApplicationDescription(const PRUnichar * aAppli
NS_IMETHODIMP nsMIMEInfoImpl::GetDefaultDescription(PRUnichar ** aDefaultDescription)
{
*aDefaultDescription = ToNewUnicode(mDefaultAppDescription);
return NS_OK;
if (mDefaultAppDescription.IsEmpty() && mDefaultApplication) {
// Don't want to cache this, just in case someone resets the app
// without changing the description....
nsAutoString leafName;
mDefaultApplication->GetLeafName(leafName);
*aDefaultDescription = ToNewUnicode(leafName);
} else {
*aDefaultDescription = ToNewUnicode(mDefaultAppDescription);
}
return *aDefaultDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
}
NS_IMETHODIMP nsMIMEInfoImpl::SetDefaultDescription(const PRUnichar * aDefaultDescription)