From 9f0147b039cdffeb3dc8a3a24ed191b0cf591e36 Mon Sep 17 00:00:00 2001 From: "cbiesinger%web.de" Date: Thu, 11 Sep 2003 12:13:06 +0000 Subject: [PATCH] Bug 217509 wrong app description shown in helper app dialog r=bz sr=darin git-svn-id: svn://10.0.0.236/trunk@146749 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp | 7 +++++++ mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp b/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp index 4c20a420ec5..1f07d036271 100644 --- a/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp +++ b/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp @@ -298,7 +298,14 @@ NS_IMETHODIMP nsMIMEInfoImpl::SetPreferredApplicationHandler(nsIFile * aPreferre NS_IMETHODIMP nsMIMEInfoImpl::GetHasDefaultHandler(PRBool * _retval) { +#ifdef XP_WIN + // On Windows, we ShellExecute any kind of file + // (defaultApplication is always null on windows, too) + // Most useful is probably presence/lack of default description + *_retval = !mDefaultAppDescription.IsEmpty(); +#else *_retval = mDefaultApplication != nsnull; +#endif return NS_OK; } diff --git a/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp b/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp index 4c20a420ec5..1f07d036271 100644 --- a/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp +++ b/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp @@ -298,7 +298,14 @@ NS_IMETHODIMP nsMIMEInfoImpl::SetPreferredApplicationHandler(nsIFile * aPreferre NS_IMETHODIMP nsMIMEInfoImpl::GetHasDefaultHandler(PRBool * _retval) { +#ifdef XP_WIN + // On Windows, we ShellExecute any kind of file + // (defaultApplication is always null on windows, too) + // Most useful is probably presence/lack of default description + *_retval = !mDefaultAppDescription.IsEmpty(); +#else *_retval = mDefaultApplication != nsnull; +#endif return NS_OK; }