diff options
Diffstat (limited to 'firefox-2.0.0.4-undo-uriloader.patch')
| -rw-r--r-- | firefox-2.0.0.4-undo-uriloader.patch | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/firefox-2.0.0.4-undo-uriloader.patch b/firefox-2.0.0.4-undo-uriloader.patch deleted file mode 100644 index f2c419b..0000000 --- a/firefox-2.0.0.4-undo-uriloader.patch +++ /dev/null @@ -1,97 +0,0 @@ -Index: mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v -retrieving revision 1.58.20.1 -retrieving revision 1.58 -diff -d -u -p -r1.58.20.1 -r1.58 ---- mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp 16 Apr 2007 18:54:53 -0000 1.58.20.1 -+++ mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp 25 Oct 2004 07:46:01 -0000 1.58 -@@ -1506,8 +1506,13 @@ nsOSHelperAppService::GetFromType(const - - nsDependentSubstring majorType(majorTypeStart, majorTypeEnd); - nsDependentSubstring minorType(minorTypeStart, minorTypeEnd); -+ nsAutoString extensions, mime_types_description; -+ LookUpExtensionsAndDescription(majorType, -+ minorType, -+ extensions, -+ mime_types_description); -+ - -- // First check the user's private mailcap file - nsAutoString mailcap_description, handler, mozillaFlags; - DoLookUpHandlerAndDescription(majorType, - minorType, -@@ -1516,46 +1521,23 @@ nsOSHelperAppService::GetFromType(const - mailcap_description, - mozillaFlags, - PR_TRUE); -- -- LOG(("Private Handler/Description results: handler='%s', description='%s'\n", -- NS_LossyConvertUTF16toASCII(handler).get(), -- NS_LossyConvertUTF16toASCII(mailcap_description).get())); - -+ -+ if (handler.IsEmpty() && extensions.IsEmpty() && -+ mailcap_description.IsEmpty() && mime_types_description.IsEmpty()) { -+ // No useful data yet -+ - #ifdef MOZ_WIDGET_GTK2 -- nsMIMEInfoBase *gnomeInfo = nsnull; -- if (handler.IsEmpty()) { -- // No useful data yet. Check the GNOME registry. Unfortunately, newer -- // GNOME versions no longer have type-to-extension mappings, so we might -- // get back a MIMEInfo without any extensions set. In that case we'll have -- // to look in our mime.types files for the extensions. - LOG(("Looking in GNOME registry\n")); -- gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get(); -- if (gnomeInfo && gnomeInfo->HasExtensions()) { -- LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n")); -+ nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get(); -+ if (gnomeInfo) { -+ LOG(("Got MIMEInfo from GNOME registry\n")); - return gnomeInfo; - } -- } - #endif -- -- // Now look up our extensions -- nsAutoString extensions, mime_types_description; -- LookUpExtensionsAndDescription(majorType, -- minorType, -- extensions, -- mime_types_description); -- --#ifdef MOZ_WIDGET_GTK2 -- if (gnomeInfo) { -- LOG(("Got MIMEInfo from GNOME registry without extensions; setting them " -- "to %s\n", NS_LossyConvertUTF16toASCII(extensions).get())); -- -- NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); -- gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); -- return gnomeInfo; - } --#endif - -- if (handler.IsEmpty()) { -+ if (handler.IsEmpty() && mailcap_description.IsEmpty()) { - DoLookUpHandlerAndDescription(majorType, - minorType, - typeOptions, -@@ -1565,7 +1547,7 @@ nsOSHelperAppService::GetFromType(const - PR_FALSE); - } - -- if (handler.IsEmpty()) { -+ if (handler.IsEmpty() && mailcap_description.IsEmpty()) { - DoLookUpHandlerAndDescription(majorType, - NS_LITERAL_STRING("*"), - typeOptions, -@@ -1575,7 +1557,7 @@ nsOSHelperAppService::GetFromType(const - PR_TRUE); - } - -- if (handler.IsEmpty()) { -+ if (handler.IsEmpty() && mailcap_description.IsEmpty()) { - DoLookUpHandlerAndDescription(majorType, - NS_LITERAL_STRING("*"), - typeOptions, |