From 8fbc8658b63effb804f8dee8fac9b835f59263d5 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Thu, 16 Oct 2003 22:15:21 +0000
Subject: [PATCH] Bug #222521 --> Auto Proxy URLs do not work in Thunderbird

---
 mail/config/basemail-win | 667 ++++++++++++++++++++-------------------
 1 file changed, 334 insertions(+), 333 deletions(-)

diff --git a/mail/config/basemail-win b/mail/config/basemail-win
index 4bc0d35909c..4fbaace61a7 100644
--- a/mail/config/basemail-win
+++ b/mail/config/basemail-win
@@ -1,333 +1,334 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Base Thunderbird Package File for Win32
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-[thunderbird]
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Mail Specific Files
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-components\mail.dll
-components\import.dll
-
-components\addrbook.xpt
-components\mime.xpt
-components\mailnews.xpt
-components\msgbase.xpt
-components\msgcompo.xpt
-components\msgdb.xpt
-components\msgimap.xpt
-components\msglocal.xpt
-components\msgnews.xpt
-components\msgsearch.xpt
-components\import.xpt
-components\impComm4xMail.xpt
-components\mailview.xpt
-
-chrome\mail.jar
-chrome\icons\default\abcardWindow.ico
-chrome\icons\default\addressbookWindow.ico
-chrome\icons\default\messengerWindow.ico
-chrome\icons\default\msgcomposeWindow.ico
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Mail Extensions (smime, etc.)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-MapiProxy.dll
-mozMapi32.dll
-components\msgMapi.dll
-components\mapihook.xpt
-components\nsSetDefaultMail.js
-components\nsUnsetDefaultMail.js
-
-components\mdn-service.js
-
-components\smime-service.js
-components\msgsmime.xpt
-components\msgsmime.dll
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Chrome Files
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-chrome\qute.jar
-chrome\en-US-mail.jar
-chrome\en-win.jar
-chrome\overlayinfo\messenger\content\overlays.rdf
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Default Profile Settings
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; default pref files
-defaults\pref\*
-defaults\messenger\mailViews.dat
-defaults\profile\localstore.rdf
-defaults\profile\mimeTypes.rdf
-defaults\profile\US\localstore.rdf
-defaults\profile\US\mimeTypes.rdf
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; App extensions to Mail
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; LDAP components 
-components\mozldap.dll
-components\mozldap.xpt
-components\nsLDAPPrefsService.js
-nsldap32v50.dll
-nsldappr32v50.dll
-
-; wallet
-components\wallet.dll
-components\wallet.xpt 
-components\signonviewer.xpt 
-
-; download progress
-components\nsProgressDialog.js
-components\nsHelperAppDlg.js
-components\nsDownloadProgressListener.js
-components\downloadmanager.xpt
-
-; spellchecker (may not be present)
-components\myspell.dll
-components\spellchecker.xpt
-components\spellchk.dll
-;; XXX these two files are bogus, they should not be in components\myspell...
-components\myspell\*
-
-; xpinstall (needed to dynamically install themes
-components\xpinstal.dll
-components\xpinstall.xpt
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Base Package Files
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; NSPR:
-nspr4.dll      
-plc4.dll       
-plds4.dll  
-
-; Javascript:
-js3250.dll   
-components\jsd3250.dll  
-components\jsurl.xpt
-
-; XPCOM:
-xpcom.dll
-xpcom_compat.dll
-components\xpcom_compat_c.dll
-components\xpcom_base.xpt
-components\xpcom_components.xpt
-components\xpcom_ds.xpt
-components\xpcom_io.xpt
-components\xpcom_thread.xpt
-components\xpcom_xpti.xpt
-components\xpcom_obsolete.xpt
-
-; xpconnect
-components\xpc3250.dll
-components\xpconnect.xpt
-
-; XP widgets/graphics
-gkgfx.dll
-components\gkgfxwin.dll      
-components\gkwidget.dll   
-components\widget.xpt
-components\gfx.xpt                      
-
-; layout
-components\gklayout.dll                   
-components\gkparser.dll                 
-components\layout_base.xpt              
-components\layout_xul.xpt               
-components\content_base.xpt
-components\htmlparser.xpt
-components\content_html.xpt
-components\content_htmldoc.xpt
-components\content_xmldoc.xpt
-components\content_xslt.xpt
-components\xultmpl.xpt
-components\xuldoc.xpt
-
-; Imaging:
-mozz.dll
-components\imglib2.dll
-components\imgicon.dll
-components\imgicon.xpt
-components\imglib2.xpt
-
-; accessibility (out of process API support)
-components\accessibility.dll              
-components\accessibility.xpt                 
-components\accessibility-msaa.xpt
-
-; caps (JavaScript security)
-components\caps.dll                     
-components\caps.xpt                             
-
-; glue: appshell, docshell, uriloader, chrome, components
-components\appshell.dll                 
-components\appshell.xpt                 
-components\docshell.dll                 
-components\docshell_base.xpt            
-components\uriloader.xpt
-components\chrome.dll                   
-components\chrome.xpt                   
-components\webbrwsr.dll              
-components\webBrowser_core.xpt
-components\embedcomponents.dll
-components\windowwatcher.xpt
-components\webbrowserpersist.xpt
-components\commandhandler.xpt
-; we need mozbrwser.xpt for nsIXULWindow.xpt
-components\mozbrwsr.xpt
-
-; jar
-components\jar50.dll
-components\jar.xpt
-
-; prefs
-components\pref.xpt                     
-components\xppref32.dll
-
-; profile
-components\profile.dll                  
-components\profile.xpt
-
-; rdf
-components\rdf.dll
-components\rdf.xpt
-
-; required i18n libraries
-components\i18n.dll
-components\intl.xpt
-components\locale.xpt
-components\uconv.dll
-components\uconv.xpt
-components\unicharutil.xpt
-components\ucnative.xpt
-
-; dom
-components\jsdom.dll   
-components\dom.xpt                      
-components\dom_base.xpt
-components\dom_core.xpt
-components\dom_css.xpt
-components\dom_events.xpt
-components\dom_html.xpt
-components\dom_range.xpt
-components\dom_stylesheets.xpt
-components\dom_traversal.xpt
-components\dom_views.xpt
-components\dom_xbl.xpt
-components\dom_xul.xpt
-
-; editor / composer for HTML compose
-components\editor.dll                   
-components\editor.xpt
-components\composer.xpt
-components\composer.dll
-components\txmgr.dll
-components\txmgr.xpt
-
-; find functionality
-; Optional - only if your code uses nsIWebBrowserFind
-components\txtsvc.xpt
-
-; netwerk
-components\necko.dll                    
-components\necko2.dll  
-components\necko.xpt                               
-components\necko_data.xpt               
-components\necko_dns.xpt                
-components\necko_http.xpt               
-components\necko_jar.xpt                
-components\necko_res.xpt                
-components\necko_strconv.xpt
-components\necko_file.xpt
-components\necko_cache.xpt
-components\necko_cookie.xpt         
-            
-; psm2
-; Optional - only if you need HTTPS support
-components\pipboot.dll
-components\pipboot.xpt
-components\pipnss.dll
-components\pipnss.xpt
-components\pippki.dll
-components\pippki.xpt
-nss3.dll
-smime3.dll
-softokn3.chk
-softokn3.dll
-ssl3.dll
-nssckbi.dll
-
-; core platform files
-regxpcom.exe
-components\appcomps.dll
-components\autocomplete.xpt
-components\alerts.xpt
-components\jsdservice.xpt
-components\find.xpt
-components\chardet.xpt
-components\jsconsole-clhandler.js
-components\layout_xul_tree.xpt
-components\mork.dll
-components\mozfind.dll
-components\mozfind.xpt
-components\mimetype.xpt
-components\nsprefm.dll
-components\prefmigr.xpt
-components\proxyObject.xpt
-components\exthandler.xpt
-components\util.xpt
-components\embed_base.xpt
-components\webshell_idls.xpt
-components\widget.xpt
-components\windowds.xpt
-components\wlltvwrs.dll
-components\helperAppDlg.xpt
-components\progressDlg.xpt
-components\dom_xpath.xpt
-AccessibleMarshal.dll
-components\lwbrk.xpt
-components\nsCloseAllWindows.js
-components\winhooks.xpt
-
-res\ua.css
-res\html.css
-res\quirk.css
-res\forms.css
-res\platform-forms.css
-res\charsetData.properties
-res\charsetalias.properties
-res\langGroups.properties
-res\language.properties
-res\wincharset.properties
-res\builtin\*
-res\entityTables\*
-
-; editor resource files
-res\EditorOverride.css
-res\grabber.gif
-res\table-add-column-after-active.gif
-res\table-add-column-after-hover.gif
-res\table-add-column-after.gif
-res\table-add-column-before-active.gif
-res\table-add-column-before-hover.gif
-res\table-add-column-before.gif
-res\table-add-row-after-active.gif
-res\table-add-row-after-hover.gif
-res\table-add-row-after.gif
-res\table-add-row-before-active.gif
-res\table-add-row-before-hover.gif
-res\table-add-row-before.gif
-res\table-remove-column-active.gif
-res\table-remove-column-hover.gif
-res\table-remove-column.gif
-res\table-remove-row-active.gif
-res\table-remove-row-hover.gif
-res\table-remove-row.gif
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Base Thunderbird Package File for Win32
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[thunderbird]
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Mail Specific Files
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+components\mail.dll
+components\import.dll
+
+components\addrbook.xpt
+components\mime.xpt
+components\mailnews.xpt
+components\msgbase.xpt
+components\msgcompo.xpt
+components\msgdb.xpt
+components\msgimap.xpt
+components\msglocal.xpt
+components\msgnews.xpt
+components\msgsearch.xpt
+components\import.xpt
+components\impComm4xMail.xpt
+components\mailview.xpt
+
+chrome\mail.jar
+chrome\icons\default\abcardWindow.ico
+chrome\icons\default\addressbookWindow.ico
+chrome\icons\default\messengerWindow.ico
+chrome\icons\default\msgcomposeWindow.ico
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Mail Extensions (smime, etc.)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+MapiProxy.dll
+mozMapi32.dll
+components\msgMapi.dll
+components\mapihook.xpt
+components\nsSetDefaultMail.js
+components\nsUnsetDefaultMail.js
+
+components\mdn-service.js
+
+components\smime-service.js
+components\msgsmime.xpt
+components\msgsmime.dll
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Chrome Files
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+chrome\qute.jar
+chrome\en-US-mail.jar
+chrome\en-win.jar
+chrome\overlayinfo\messenger\content\overlays.rdf
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Default Profile Settings
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; default pref files
+defaults\pref\*
+defaults\messenger\mailViews.dat
+defaults\profile\localstore.rdf
+defaults\profile\mimeTypes.rdf
+defaults\profile\US\localstore.rdf
+defaults\profile\US\mimeTypes.rdf
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; App extensions to Mail
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; LDAP components 
+components\mozldap.dll
+components\mozldap.xpt
+components\nsLDAPPrefsService.js
+nsldap32v50.dll
+nsldappr32v50.dll
+
+; wallet
+components\wallet.dll
+components\wallet.xpt 
+components\signonviewer.xpt 
+
+; download progress
+components\nsProgressDialog.js
+components\nsHelperAppDlg.js
+components\nsDownloadProgressListener.js
+components\downloadmanager.xpt
+
+; spellchecker (may not be present)
+components\myspell.dll
+components\spellchecker.xpt
+components\spellchk.dll
+;; XXX these two files are bogus, they should not be in components\myspell...
+components\myspell\*
+
+; xpinstall (needed to dynamically install themes
+components\xpinstal.dll
+components\xpinstall.xpt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Base Package Files
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; NSPR:
+nspr4.dll      
+plc4.dll       
+plds4.dll  
+
+; Javascript:
+js3250.dll   
+components\jsd3250.dll  
+components\jsurl.xpt
+
+; XPCOM:
+xpcom.dll
+xpcom_compat.dll
+components\xpcom_compat_c.dll
+components\xpcom_base.xpt
+components\xpcom_components.xpt
+components\xpcom_ds.xpt
+components\xpcom_io.xpt
+components\xpcom_thread.xpt
+components\xpcom_xpti.xpt
+components\xpcom_obsolete.xpt
+
+; xpconnect
+components\xpc3250.dll
+components\xpconnect.xpt
+
+; XP widgets/graphics
+gkgfx.dll
+components\gkgfxwin.dll      
+components\gkwidget.dll   
+components\widget.xpt
+components\gfx.xpt                      
+
+; layout
+components\gklayout.dll                   
+components\gkparser.dll                 
+components\layout_base.xpt              
+components\layout_xul.xpt               
+components\content_base.xpt
+components\htmlparser.xpt
+components\content_html.xpt
+components\content_htmldoc.xpt
+components\content_xmldoc.xpt
+components\content_xslt.xpt
+components\xultmpl.xpt
+components\xuldoc.xpt
+
+; Imaging:
+mozz.dll
+components\imglib2.dll
+components\imgicon.dll
+components\imgicon.xpt
+components\imglib2.xpt
+
+; accessibility (out of process API support)
+components\accessibility.dll              
+components\accessibility.xpt                 
+components\accessibility-msaa.xpt
+
+; caps (JavaScript security)
+components\caps.dll                     
+components\caps.xpt                             
+
+; glue: appshell, docshell, uriloader, chrome, components
+components\appshell.dll                 
+components\appshell.xpt                 
+components\docshell.dll                 
+components\docshell_base.xpt            
+components\uriloader.xpt
+components\chrome.dll                   
+components\chrome.xpt                   
+components\webbrwsr.dll              
+components\webBrowser_core.xpt
+components\embedcomponents.dll
+components\windowwatcher.xpt
+components\webbrowserpersist.xpt
+components\commandhandler.xpt
+; we need mozbrwser.xpt for nsIXULWindow.xpt
+components\mozbrwsr.xpt
+
+; jar
+components\jar50.dll
+components\jar.xpt
+
+; prefs
+components\pref.xpt                     
+components\xppref32.dll
+
+; profile
+components\profile.dll                  
+components\profile.xpt
+
+; rdf
+components\rdf.dll
+components\rdf.xpt
+
+; required i18n libraries
+components\i18n.dll
+components\intl.xpt
+components\locale.xpt
+components\uconv.dll
+components\uconv.xpt
+components\unicharutil.xpt
+components\ucnative.xpt
+
+; dom
+components\jsdom.dll   
+components\dom.xpt                      
+components\dom_base.xpt
+components\dom_core.xpt
+components\dom_css.xpt
+components\dom_events.xpt
+components\dom_html.xpt
+components\dom_range.xpt
+components\dom_stylesheets.xpt
+components\dom_traversal.xpt
+components\dom_views.xpt
+components\dom_xbl.xpt
+components\dom_xul.xpt
+
+; editor / composer for HTML compose
+components\editor.dll                   
+components\editor.xpt
+components\composer.xpt
+components\composer.dll
+components\txmgr.dll
+components\txmgr.xpt
+
+; find functionality
+; Optional - only if your code uses nsIWebBrowserFind
+components\txtsvc.xpt
+
+; netwerk
+components\necko.dll                    
+components\necko2.dll  
+components\necko.xpt                               
+components\necko_data.xpt               
+components\necko_dns.xpt                
+components\necko_http.xpt               
+components\necko_jar.xpt                
+components\necko_res.xpt                
+components\necko_strconv.xpt
+components\necko_file.xpt
+components\necko_cache.xpt
+components\necko_cookie.xpt         
+components\nsProxyAutoConfig.js
+            
+; psm2
+; Optional - only if you need HTTPS support
+components\pipboot.dll
+components\pipboot.xpt
+components\pipnss.dll
+components\pipnss.xpt
+components\pippki.dll
+components\pippki.xpt
+nss3.dll
+smime3.dll
+softokn3.chk
+softokn3.dll
+ssl3.dll
+nssckbi.dll
+
+; core platform files
+regxpcom.exe
+components\appcomps.dll
+components\autocomplete.xpt
+components\alerts.xpt
+components\jsdservice.xpt
+components\find.xpt
+components\chardet.xpt
+components\jsconsole-clhandler.js
+components\layout_xul_tree.xpt
+components\mork.dll
+components\mozfind.dll
+components\mozfind.xpt
+components\mimetype.xpt
+components\nsprefm.dll
+components\prefmigr.xpt
+components\proxyObject.xpt
+components\exthandler.xpt
+components\util.xpt
+components\embed_base.xpt
+components\webshell_idls.xpt
+components\widget.xpt
+components\windowds.xpt
+components\wlltvwrs.dll
+components\helperAppDlg.xpt
+components\progressDlg.xpt
+components\dom_xpath.xpt
+AccessibleMarshal.dll
+components\lwbrk.xpt
+components\nsCloseAllWindows.js
+components\winhooks.xpt
+
+res\ua.css
+res\html.css
+res\quirk.css
+res\forms.css
+res\platform-forms.css
+res\charsetData.properties
+res\charsetalias.properties
+res\langGroups.properties
+res\language.properties
+res\wincharset.properties
+res\builtin\*
+res\entityTables\*
+
+; editor resource files
+res\EditorOverride.css
+res\grabber.gif
+res\table-add-column-after-active.gif
+res\table-add-column-after-hover.gif
+res\table-add-column-after.gif
+res\table-add-column-before-active.gif
+res\table-add-column-before-hover.gif
+res\table-add-column-before.gif
+res\table-add-row-after-active.gif
+res\table-add-row-after-hover.gif
+res\table-add-row-after.gif
+res\table-add-row-before-active.gif
+res\table-add-row-before-hover.gif
+res\table-add-row-before.gif
+res\table-remove-column-active.gif
+res\table-remove-column-hover.gif
+res\table-remove-column.gif
+res\table-remove-row-active.gif
+res\table-remove-row-hover.gif
+res\table-remove-row.gif