Take site read only

git-svn-id: svn://10.0.0.236/trunk@265943 18797224-902f-48f8-a5cc-f745e15eee43

CVSROOT/commitcheck.pl

@@ -2,20 +2,24 @@
 # DO NOT EDIT THIS FILE!  You must instead go to https://despot.mozilla.org/, and
 # tweak things from there.
 
-$mode{'180'} = 'Open';
+$mode{'180'} = 'Closed';
 $branch{'180'} = 'HEAD';
 $fullname{'180'} = 'accessibility';
+$blessed{'180'} = ['aaronleventhal%moonset.net',];
+$super{'180'} = ['marco.zehe%googlemail.com','ginn.chen%sun.com','dbolter%mozilla.com','surkov.alexander%gmail.com',];
 $mode{'188'} = 'Open';
 $branch{'188'} = 'HEAD';
 $fullname{'188'} = 'Application Suite';
-$mode{'190'} = 'Open';
+$mode{'190'} = 'Closed';
 $branch{'190'} = 'HEAD';
 $fullname{'190'} = 'Bugzilla';
+$blessed{'190'} = ['wurblzap%gmail.com','olav%bkor.dhs.org','lpsolit%gmail.com','ghendricks%novell.com',];
+$super{'190'} = ['bzrmirror%bugzilla.org','justdave%bugzilla.org',];
 $mode{'204'} = 'Closed';
 $branch{'204'} = 'BUGZILLA-2_18-BRANCH';
 $fullname{'204'} = 'Bugzilla2.18';
-$blessed{'204'} = ['myk%mozilla.org','vladd%bugzilla.org','olav%bkor.dhs.org','ghendricks%novell.com',];
-$super{'204'} = ['mkanat%bugzilla.org','lpsolit%gmail.com','justdave%bugzilla.org',];
+$blessed{'204'} = [];
+$super{'204'} = ['justdave%bugzilla.org',];
 $mode{'191'} = 'Closed';
 $branch{'191'} = 'BUGZILLA-2_20-BRANCH';
 $fullname{'191'} = 'Bugzilla2.20';
@@ -26,23 +30,30 @@ $branch{'203'} = 'BUGZILLA-2_22-BRANCH';
 $fullname{'203'} = 'Bugzilla2.22';
 $blessed{'203'} = ['wurblzap%gmail.com','vladd%bugzilla.org','reed%reedloden.com','olav%bkor.dhs.org','myk%mozilla.org','ghendricks%novell.com',];
 $super{'203'} = ['mkanat%bugzilla.org','lpsolit%gmail.com','justdave%bugzilla.org',];
-$mode{'212'} = 'Restricted';
+$mode{'212'} = 'Closed';
 $branch{'212'} = 'BUGZILLA-3_0-BRANCH';
 $fullname{'212'} = 'Bugzilla3.0';
 $blessed{'212'} = ['wurblzap%gmail.com','vladd%bugzilla.org','olav%bkor.dhs.org','myk%mozilla.org','ghendricks%novell.com',];
 $super{'212'} = ['mkanat%bugzilla.org','lpsolit%gmail.com','justdave%bugzilla.org',];
-$mode{'217'} = 'Open';
+$mode{'217'} = 'Closed';
 $branch{'217'} = 'BUGZILLA-3_2-BRANCH';
 $fullname{'217'} = 'Bugzilla3.2';
-$mode{'220'} = 'Open';
+$blessed{'217'} = ['wurblzap%gmail.com','vladd%bugzilla.org','olav%bkor.dhs.org','myk%mozilla.org','ghendricks%novell.com',];
+$super{'217'} = ['mkanat%bugzilla.org','lpsolit%gmail.com','justdave%bugzilla.org',];
+$mode{'220'} = 'Closed';
 $branch{'220'} = 'BUGZILLA-3_4-BRANCH';
 $fullname{'220'} = 'Bugzilla3.4';
+$blessed{'220'} = ['wurblzap%gmail.com','olav%bkor.dhs.org','ghendricks%novell.com','dlawrence%mozilla.com',];
+$super{'220'} = ['mkanat%bugzilla.org','lpsolit%gmail.com','justdave%bugzilla.org',];
 $mode{'214'} = 'Open';
 $branch{'214'} = 'HEAD';
 $fullname{'214'} = 'Build and Release Tools';
 $mode{'55'} = 'Open';
 $branch{'55'} = 'HEAD';
 $fullname{'55'} = 'Build Config';
+$mode{'226'} = 'Open';
+$branch{'226'} = 'HEAD';
+$fullname{'226'} = 'Build Config: comm-central';
 $mode{'183'} = 'Open';
 $branch{'183'} = 'HEAD';
 $fullname{'183'} = 'calendar';
@@ -55,7 +66,7 @@ $fullname{'211'} = 'ChatZilla';
 $mode{'146'} = 'Restricted';
 $branch{'146'} = 'NSPRPUB_PRE_4_2_CLIENT_BRANCH';
 $fullname{'146'} = 'Client NSPR';
-$blessed{'146'} = ['sgautherie.bz%free.fr','mozilla%weilbacher.org','kaie%kuix.de','julien.pierre.boogz%sun.com','gerv%gerv.net','alexei.volkov.bugs%sun.com',];
+$blessed{'146'} = ['sgautherie.bz%free.fr','mozilla%weilbacher.org','kaie%kuix.de','julien.pierre.boogz%sun.com','gerv%gerv.net','alexei.volkov.bugs%sun.com','unai.gaston%sun.com',];
 $super{'146'} = ['ted.mielczarek%gmail.com','wtc%google.com','nelson%bolyard.com',];
 $mode{'213'} = 'Open';
 $branch{'213'} = 'HEAD';
@@ -74,7 +85,7 @@ $mode{'3'} = 'Closed';
 $branch{'3'} = 'HEAD';
 $fullname{'3'} = 'despotaccess';
 $blessed{'3'} = [];
-$super{'3'} = ['myk%mozilla.org','leaf%mozilla.org','despotdaemon',];
+$super{'3'} = ['justdave%bugzilla.org','despotdaemon',];
 $mode{'59'} = 'Open';
 $branch{'59'} = 'HEAD';
 $fullname{'59'} = 'Directory SDK';
@@ -135,17 +146,23 @@ $fullname{'129'} = 'Java-Implemented Plugins';
 $mode{'70'} = 'Restricted';
 $branch{'70'} = 'HEAD';
 $fullname{'70'} = 'JavaScript';
-$blessed{'70'} = ['vladimir%pobox.com','timeless%mozdev.org','sayrer%gmail.com','reed%reedloden.com','peterv%propagandism.org','pavlov%pavlov.net','jst%mozilla.org','jruderman%hmc.edu','jag%tty.nl','gerv%gerv.net','gavin%gavinsharp.com','dbaron%dbaron.org','daumling%adobe.com','cls%seawood.org','bzbarsky%mit.edu','bryner%brianryner.com','benjamin%smedbergs.us','bclary%bclary.com',];
-$super{'70'} = ['graydon%mozilla.com','jorendorff%mozilla.com','shaver%mozilla.org','mrbkap%gmail.com','jwalden%mit.edu','igor%mir2.org','crowder%fiverocks.com','brendan%mozilla.org',];
+$blessed{'70'} = ['vladimir%pobox.com','timeless%mozdev.org','sayrer%gmail.com','reed%reedloden.com','peterv%propagandism.org','pavlov%pavlov.net','jst%mozilla.org','jruderman%hmc.edu','jag%tty.nl','gerv%gerv.net','gavin%gavinsharp.com','dveditz%cruzio.com','dbaron%dbaron.org','daumling%adobe.com','cls%seawood.org','bzbarsky%mit.edu','bryner%brianryner.com','benjamin%smedbergs.us','bclary%bclary.com',];
+$super{'70'} = ['shaver%mozilla.org','mrbkap%gmail.com','lwagner%mozilla.com','jwalden%mit.edu','jorendorff%mozilla.com','igor%mir2.org','graydon%mozilla.com','crowder%fiverocks.com','brendan%mozilla.org',];
 $mode{'207'} = 'Open';
 $branch{'207'} = 'HEAD';
 $fullname{'207'} = 'JavaScript Debugger Backend';
+$mode{'223'} = 'Open';
+$branch{'223'} = 'HEAD';
+$fullname{'223'} = 'js-ctypes';
 $mode{'114'} = 'Open';
 $branch{'114'} = 'HEAD';
 $fullname{'114'} = 'js-tests';
 $mode{'98'} = 'Open';
 $branch{'98'} = 'HEAD';
 $fullname{'98'} = 'Layout Engine';
+$mode{'221'} = 'Open';
+$branch{'221'} = 'HEAD';
+$fullname{'221'} = 'libjar';
 $mode{'72'} = 'Open';
 $branch{'72'} = 'HEAD';
 $fullname{'72'} = 'LiveConnect';
@@ -170,19 +187,22 @@ $fullname{'77'} = 'NetLib';
 $mode{'78'} = 'Restricted';
 $branch{'78'} = 'HEAD';
 $fullname{'78'} = 'NSPR';
-$blessed{'78'} = ['sgautherie.bz%free.fr','mozilla%weilbacher.org','kaie%kuix.de','julien.pierre.boogz%sun.com','glen.beasley%sun.com','gerv%gerv.net','christophe.ravel.bugs%sun.com','alexei.volkov.bugs%sun.com',];
+$blessed{'78'} = ['gerv%gerv.net','mozilla%weilbacher.org','kaie%kuix.de','christophe.ravel.bugs%sun.com','bsmith%mozilla.com','alexei.volkov.bugs%sun.com',];
 $super{'78'} = ['ted.mielczarek%gmail.com','wtc%google.com','nelson%bolyard.com',];
 $mode{'163'} = 'Restricted';
 $branch{'163'} = 'NSS_3_11_BRANCH';
 $fullname{'163'} = 'NSS Stable Release Branch';
 $blessed{'163'} = ['gerv%gerv.net','douglas%stebila.ca',];
-$super{'163'} = ['emaldona%redhat.com','slavomir.katuscak%sun.com','kaie%kuix.de','glen.beasley%sun.com','christophe.ravel.bugs%sun.com','alexei.volkov.bugs%sun.com','wtc%google.com','rrelyea%redhat.com','nelson%bolyard.com','julien.pierre.boogz%sun.com',];
+$super{'163'} = ['slavomir.katuscak%sun.com','kaie%kuix.de','glen.beasley%sun.com','emaldona%redhat.com','christophe.ravel.bugs%sun.com','alexei.volkov.bugs%sun.com','wtc%google.com','rrelyea%redhat.com','nelson%bolyard.com','julien.pierre.boogz%sun.com',];
 $mode{'162'} = 'Open';
 $branch{'162'} = 'HEAD';
 $fullname{'162'} = 'P3P';
 $mode{'209'} = 'Open';
 $branch{'209'} = 'HEAD';
 $fullname{'209'} = 'Party Tool';
+$mode{'225'} = 'Open';
+$branch{'225'} = 'HEAD';
+$fullname{'225'} = 'Penelope';
 $mode{'81'} = 'Open';
 $branch{'81'} = 'HEAD';
 $fullname{'81'} = 'Plugins';
@@ -195,6 +215,9 @@ $fullname{'69'} = 'Privilege Manager';
 $mode{'219'} = 'Open';
 $branch{'219'} = 'HEAD';
 $fullname{'219'} = 'PyXPCOM';
+$mode{'161'} = 'Open';
+$branch{'161'} = 'HEAD';
+$fullname{'161'} = 'Qt-based gfx and widget';
 $mode{'52'} = 'Open';
 $branch{'52'} = 'HEAD';
 $fullname{'52'} = 'RDF';
@@ -204,9 +227,6 @@ $fullname{'84'} = 'Registry';
 $mode{'113'} = 'Open';
 $branch{'113'} = 'HEAD';
 $fullname{'113'} = 'REMOVEME - Photon';
-$mode{'161'} = 'Open';
-$branch{'161'} = 'HEAD';
-$fullname{'161'} = 'REMOVEME - Qt-based gfx and widget';
 $mode{'121'} = 'Open';
 $branch{'121'} = 'HEAD';
 $fullname{'121'} = 'REMOVEME - Xlib-based gfx and widget';
@@ -219,8 +239,8 @@ $fullname{'138'} = 'Rhino';
 $mode{'145'} = 'Restricted';
 $branch{'145'} = 'HEAD';
 $fullname{'145'} = 'security';
-$blessed{'145'} = ['gerv%gerv.net','douglas%stebila.ca',];
-$super{'145'} = ['wtc%google.com','slavomir.katuscak%sun.com','kaie%kuix.de','glen.beasley%sun.com','emaldona%redhat.com','christophe.ravel.bugs%sun.com','alexei.volkov.bugs%sun.com','rrelyea%redhat.com','nelson%bolyard.com','julien.pierre.boogz%sun.com',];
+$blessed{'145'} = ['gerv%gerv.net','cfu%redhat.com',];
+$super{'145'} = ['ryan.sleevi%gmail.com','kaie%kuix.de','emaldona%redhat.com','bsmith%mozilla.com','wtc%google.com','rrelyea%redhat.com',];
 $mode{'151'} = 'Open';
 $branch{'151'} = 'HEAD';
 $fullname{'151'} = 'Security - Mozilla PSM Glue';
@@ -334,116 +354,8 @@ if ($b eq 'BUGZILLA-3_4-BRANCH') {
 if (m:^mozilla/webtools/bugzilla/.*$:) {return '220';}
 }
 if ($b eq 'HEAD') {
-if (m:^mozilla/java/dom/.*$:) {return '130';}
-if (m:^mozilla/extensions/help/.*$:) {return '188';}
-if (m:^mozilla/suite/.*$:) {return '188';}
-if (m:^mozilla/modules/libreg/.*$:) {return '84';}
-if (m:^mozilla/java/util/.*$:) {return '133';}
-if (m:^db/sqlite3/.*$:) {return '216';}
-if (m:^storage/.*$:) {return '216';}
-if (m:^mozilla/content/xbl/[^/]*$:) {return '199';}
-if (m:^mozilla/content/xbl/public/.*$:) {return '199';}
-if (m:^mozilla/content/xbl/src/.*$:) {return '199';}
-if (m:^mozilla/webtools/bugzilla/.*$:) {return '190';}
-if (m:^mozilla/content/xml/.*$:) {return '88';}
-if (m:^mozilla/extensions/xmlextras/.*$:) {return '88';}
-if (m:^mozilla/parser/expat/.*$:) {return '88';}
-if (m:^mozilla/content/xtf/.*$:) {return '200';}
-if (m:^mozilla/layout/xtf/.*$:) {return '200';}
-if (m:^mozilla/tools/wizards/.*$:) {return '89';}
-if (m:^mozilla/xpcom/[^/]*$:) {return '89';}
-if (m:^mozilla/xpcom/base/.*$:) {return '89';}
-if (m:^mozilla/xpcom/build/.*$:) {return '89';}
-if (m:^mozilla/xpcom/components/.*$:) {return '89';}
-if (m:^mozilla/xpcom/doc/.*$:) {return '89';}
-if (m:^mozilla/xpcom/ds/.*$:) {return '89';}
-if (m:^mozilla/xpcom/glue/.*$:) {return '89';}
-if (m:^mozilla/xpcom/MoreFiles/.*$:) {return '89';}
-if (m:^mozilla/xpcom/obsolete/.*$:) {return '89';}
-if (m:^mozilla/xpcom/proxy/.*$:) {return '89';}
-if (m:^mozilla/xpcom/sample/.*$:) {return '89';}
-if (m:^mozilla/xpcom/stub/.*$:) {return '89';}
-if (m:^mozilla/xpcom/tests/.*$:) {return '89';}
-if (m:^mozilla/xpcom/threads/.*$:) {return '89';}
-if (m:^mozilla/xpcom/tools/.*$:) {return '89';}
-if (m:^mozilla/xpcom/windbgdlg/.*$:) {return '89';}
-if (m:^mozilla/gfx/[^/]*$:) {return '201';}
-if (m:^mozilla/gfx/cairo/.*$:) {return '201';}
-if (m:^mozilla/gfx/public/.*$:) {return '201';}
-if (m:^mozilla/gfx/src/[^/]*$:) {return '201';}
-if (m:^mozilla/gfx/src/gtk/.*$:) {return '201';}
-if (m:^mozilla/gfx/src/mac/.*$:) {return '201';}
-if (m:^mozilla/gfx/src/shared/.*$:) {return '201';}
-if (m:^mozilla/gfx/src/thebes/.*$:) {return '201';}
-if (m:^mozilla/gfx/src/windows/.*$:) {return '201';}
-if (m:^mozilla/gfx/thebes/.*$:) {return '201';}
-if (m:^mozilla/modules/lcms/.*$:) {return '201';}
-if (m:^mozilla/xpcom/reflect/xptcall/.*$:) {return '206';}
-if (m:^mozilla/gfx/src/xprint/.*$:) {return '179';}
-if (m:^mozilla/xpinstall/.*$:) {return '150';}
-if (m:^mozilla/view/.*$:) {return '96';}
-if (m:^mozilla/security/manager/.*$:) {return '151';}
-if (m:^mozilla/layout/[^/]*$:) {return '98';}
-if (m:^mozilla/layout/base/.*$:) {return '98';}
-if (m:^mozilla/layout/build/.*$:) {return '98';}
-if (m:^mozilla/layout/doc/.*$:) {return '98';}
-if (m:^mozilla/layout/forms/.*$:) {return '98';}
-if (m:^mozilla/layout/generic/.*$:) {return '98';}
-if (m:^mozilla/layout/html/.*$:) {return '98';}
-if (m:^mozilla/layout/macbuild/.*$:) {return '98';}
-if (m:^mozilla/layout/printing/.*$:) {return '98';}
-if (m:^mozilla/layout/tables/.*$:) {return '98';}
-if (m:^mozilla/layout/tools/.*$:) {return '98';}
-if (m:^mozilla/webtools/addons/.*$:) {return '185';}
-if (m:^mozilla/webtools/aus/.*$:) {return '185';}
-if (m:^mozilla/webtools/update/.*$:) {return '185';}
-if (m:^CVSROOT/commitcheck\.pl$:) {return '3';}
-if (m:^CVSROOT/passwd$:) {return '3';}
-if (m:^mozilla/layout/style/.*$:) {return '100';}
-if (m:^mozilla/mailnews/local/src/nsMovemail.*$:) {return '157';}
-if (m:^mozilla/docshell/.*$:) {return '101';}
-if (m:^mozilla/uriloader/.*$:) {return '101';}
-if (m:^mozilla/webshell/.*$:) {return '101';}
-if (m:^mozilla/embedding/.*$:) {return '208';}
-if (m:^mozilla/dbm/.*$:) {return '145';}
-if (m:^mozilla/security/coreconf/.*$:) {return '145';}
-if (m:^mozilla/security/dbm/.*$:) {return '145';}
-if (m:^mozilla/security/jss/.*$:) {return '145';}
-if (m:^mozilla/security/nss/.*$:) {return '145';}
-if (m:^mozilla/security/tinderbox/.*$:) {return '145';}
-if (m:^mozilla/security/tinderlight/.*$:) {return '145';}
-if (m:^mozilla/parser/htmlparser$:) {return '102';}
-if (m:^extension/python$:) {return '219';}
-if (m:^mozilla/composer/.*$:) {return '173';}
-if (m:^mozilla/content/base/.*$:) {return '103';}
-if (m:^mozilla/content/events/.*$:) {return '103';}
-if (m:^mozilla/content/html/content/.*$:) {return '103';}
-if (m:^mozilla/content/html/document/.*$:) {return '103';}
-if (m:^mozilla/dom/.*$:) {return '103';}
-if (m:^mozilla/string/.*$:) {return '160';}
-if (m:^mozilla/xpcom/string/.*$:) {return '160';}
-if (m:^mozilla/[^/]*$:) {return '19';}
-if (m:^mozilla/tools/README$:) {return '19';}
-if (m:^mozilla/js/rhino/.*$:) {return '138';}
-if (m:^mozilla/gfx/src/qt/.*$:) {return '161';}
-if (m:^mozilla/widget/src/qt/.*$:) {return '161';}
-if (m:^mozilla/gfx/src/xlib/.*$:) {return '121';}
-if (m:^mozilla/widget/src/xlib/.*$:) {return '121';}
-if (m:^mozilla/widget/src/xlibxtbin/.*$:) {return '121';}
-if (m:^mozilla/xpfe/.*$:) {return '137';}
-if (m:^mozilla/webtools/partytool/.*$:) {return '209';}
-if (m:^mozilla/js/tests/.*$:) {return '114';}
-if (m:^mozilla/extensions/p3p/.*$:) {return '162';}
-if (m:^mozilla/widget/src/gtk/.*$:) {return '49';}
-if (m:^mozilla/widget/src/gtk2/.*$:) {return '49';}
-if (m:^mozilla/widget/src/gtksuperwin/.*$:) {return '49';}
-if (m:^mozilla/widget/src/gtkxtbin/.*$:) {return '49';}
-if (m:^mozilla/layout/mathml/.*$:) {return '165';}
 if (m:^mozilla/rdf/.*$:) {return '52';}
-if (m:^mozilla/content/xslt/.*$:) {return '140';}
-if (m:^mozilla/extensions/transformiix/.*$:) {return '140';}
-if (m:^mozilla/browser/.*$:) {return '166';}
-if (m:^mozilla/other-licenses/branding/firefox/.*$:) {return '166';}
+if (m:^mozilla/extensions/p3p/.*$:) {return '162';}
 if (m:^mozilla/build/.*$:) {return '55';}
 if (m:^mozilla/config/.*$:) {return '55';}
 if (m:^mozilla/tools/cross-commit$:) {return '55';}
@@ -452,25 +364,28 @@ if (m:^mozilla/tools/cvsmgmt/.*$:) {return '55';}
 if (m:^mozilla/tools/elf-dynstr-gc/.*$:) {return '55';}
 if (m:^mozilla/tools/relic/.*$:) {return '55';}
 if (m:^mozilla/tools/trees\.pl$:) {return '55';}
+if (m:^mozilla/content/xslt/.*$:) {return '140';}
+if (m:^mozilla/extensions/transformiix/.*$:) {return '140';}
+if (m:^mozilla/layout/mathml/.*$:) {return '165';}
+if (m:^mozilla/editor/.*$:) {return '56';}
 if (m:^mozilla/calendar/.*$:) {return '183';}
+if (m:^mozilla/browser/.*$:) {return '166';}
+if (m:^mozilla/other-licenses/branding/firefox/.*$:) {return '166';}
+if (m:^mozilla/directory/.*$:) {return '59';}
+if (m:^mozilla/gfx/src/photon/.*$:) {return '113';}
+if (m:^mozilla/widget/src/photon/.*$:) {return '113';}
 if (m:^mozilla/chrome/.*$:) {return '169';}
 if (m:^mozilla/profile/.*$:) {return '169';}
 if (m:^mozilla/toolkit/.*$:) {return '169';}
 if (m:^mozilla/xulrunner/.*$:) {return '169';}
-if (m:^mozilla/editor/.*$:) {return '56';}
-if (m:^mozilla/gfx/src/photon/.*$:) {return '113';}
-if (m:^mozilla/widget/src/photon/.*$:) {return '113';}
-if (m:^mozilla/mail/.*$:) {return '170';}
-if (m:^mozilla/other-licenses/branding/thunderbird/.*$:) {return '170';}
-if (m:^mozilla/directory/.*$:) {return '59';}
-if (m:^mozilla/content/xul/.*$:) {return '106';}
-if (m:^mozilla/layout/xul/.*$:) {return '106';}
-if (m:^mozilla/extensions/cookie/.*$:) {return '171';}
-if (m:^mozilla/netwerk/cookie/.*$:) {return '171';}
 if (m:^mozilla/jpeg/.*$:) {return '63';}
 if (m:^mozilla/modules/libimg/png/.*$:) {return '63';}
 if (m:^mozilla/modules/libpr0n/.*$:) {return '63';}
 if (m:^mozilla/modules/zlib/.*$:) {return '63';}
+if (m:^mozilla/content/xul/.*$:) {return '106';}
+if (m:^mozilla/layout/xul/.*$:) {return '106';}
+if (m:^mozilla/mail/.*$:) {return '170';}
+if (m:^mozilla/other-licenses/branding/thunderbird/.*$:) {return '170';}
 if (m:^mozilla/testing/.*$:) {return '202';}
 if (m:^mozilla/tools/httptester/.*$:) {return '202';}
 if (m:^mozilla/tools/page-loader/.*$:) {return '202';}
@@ -478,8 +393,14 @@ if (m:^mozilla/tools/test-harness/.*$:) {return '202';}
 if (m:^mozilla/tools/tests/.*$:) {return '202';}
 if (m:^mozilla/tools/testserver/.*$:) {return '202';}
 if (m:^mozilla/tools/testy/.*$:) {return '202';}
+if (m:^mozilla/extensions/cookie/.*$:) {return '171';}
+if (m:^mozilla/netwerk/cookie/.*$:) {return '171';}
+if (m:^mozilla/intl/.*$:) {return '67';}
 if (m:^mozilla/extensions/irc/.*$:) {return '211';}
 if (m:^mozilla/widget/src/beos/.*$:) {return '172';}
+if (m:^mozilla/modules/oji/.*$:) {return '68';}
+if (m:^mozilla/nav-java/.*$:) {return '68';}
+if (m:^mozilla/sun-java/.*$:) {return '68';}
 if (m:^mozilla/tools/botrunner\.py$:) {return '214';}
 if (m:^mozilla/tools/build-environment/.*$:) {return '214';}
 if (m:^mozilla/tools/build/.*$:) {return '214';}
@@ -494,7 +415,7 @@ if (m:^mozilla/tools/release/.*$:) {return '214';}
 if (m:^mozilla/tools/tinderbox-configs/.*$:) {return '214';}
 if (m:^mozilla/tools/tinderbox/.*$:) {return '214';}
 if (m:^mozilla/tools/update-packaging/.*$:) {return '214';}
-if (m:^mozilla/intl/.*$:) {return '67';}
+if (m:^mozilla/caps/.*$:) {return '69';}
 if (m:^mozilla/tools/codesighs/.*$:) {return '213';}
 if (m:^mozilla/tools/debug/.*$:) {return '213';}
 if (m:^mozilla/tools/dreftool/.*$:) {return '213';}
@@ -512,29 +433,21 @@ if (m:^mozilla/tools/reorder/.*$:) {return '213';}
 if (m:^mozilla/tools/trace-malloc/.*$:) {return '213';}
 if (m:^mozilla/tools/uuiddeps/.*$:) {return '213';}
 if (m:^mozilla/widget/src/windows/.*$:) {return '175';}
-if (m:^mozilla/modules/oji/.*$:) {return '68';}
-if (m:^mozilla/nav-java/.*$:) {return '68';}
-if (m:^mozilla/sun-java/.*$:) {return '68';}
+if (m:^mozilla/js/src/[^/]*$:) {return '70';}
+if (m:^mozilla/js/src/config/.*$:) {return '70';}
+if (m:^mozilla/js/src/editline/.*$:) {return '70';}
+if (m:^mozilla/js/src/fdlibm/.*$:) {return '70';}
 if (m:^mozilla/xpcom/typelib/.*$:) {return '117';}
 if (m:^mozilla/camino/.*$:) {return '210';}
-if (m:^mozilla/caps/.*$:) {return '69';}
+if (m:^mozilla/extensions/venkman/.*$:) {return '71';}
 if (m:^mozilla/js/src/xpconnect/.*$:) {return '118';}
 if (m:^mozilla/widget/[^/]*$:) {return '177';}
 if (m:^mozilla/widget/public/.*$:) {return '177';}
 if (m:^mozilla/widget/src/[^/]*$:) {return '177';}
 if (m:^mozilla/widget/src/xpwidgets/.*$:) {return '177';}
-if (m:^mozilla/js/src/[^/]*$:) {return '70';}
-if (m:^mozilla/js/src/config/.*$:) {return '70';}
-if (m:^mozilla/js/src/editline/.*$:) {return '70';}
-if (m:^mozilla/js/src/fdlibm/.*$:) {return '70';}
+if (m:^mozilla/js/src/liveconnect/.*$:) {return '72';}
 if (m:^mozilla/js/jsd/.*$:) {return '207';}
 if (m:^mozilla/widget/src/cocoa/.*$:) {return '178';}
-if (m:^mozilla/extensions/venkman/.*$:) {return '71';}
-if (m:^mozilla/mailnews/[^/]*$:) {return '123';}
-if (m:^mozilla/accessibility/.*$:) {return '180';}
-if (m:^mozilla/js/src/liveconnect/.*$:) {return '72';}
-if (m:^mozilla/mailnews/mime/[^/]*$:) {return '124';}
-if (m:^mozilla/extensions/typeaheadfind/.*$:) {return '181';}
 if (m:^mozilla/netwerk/[^/]*$:) {return '77';}
 if (m:^mozilla/netwerk/base/.*$:) {return '77';}
 if (m:^mozilla/netwerk/build/.*$:) {return '77';}
@@ -549,17 +462,131 @@ if (m:^mozilla/netwerk/streamconv/.*$:) {return '77';}
 if (m:^mozilla/netwerk/system/.*$:) {return '77';}
 if (m:^mozilla/netwerk/test/.*$:) {return '77';}
 if (m:^mozilla/netwerk/testserver/.*$:) {return '77';}
+if (m:^mozilla/mailnews/[^/]*$:) {return '123';}
+if (m:^mozilla/accessibility/.*$:) {return '180';}
+if (m:^mozilla/nsprpub/.*$:) {return '78';}
+if (m:^mozilla/mailnews/mime/[^/]*$:) {return '124';}
+if (m:^mozilla/extensions/typeaheadfind/.*$:) {return '181';}
+if (m:^mozilla/dom/plugins/.*$:) {return '81';}
+if (m:^mozilla/modules/plugin/.*$:) {return '81';}
 if (m:^mozilla/extensions/java$:) {return '128';}
 if (m:^mozilla/content/xbl/builtin/.*$:) {return '182';}
-if (m:^mozilla/nsprpub/.*$:) {return '78';}
+if (m:^mozilla/modules/libpref/.*$:) {return '82';}
 if (m:^mozilla/java/plugins/.*$:) {return '129';}
 if (m:^mozilla/extensions/inspector/.*$:) {return '184';}
 if (m:^mozilla/layout/inspector/.*$:) {return '184';}
-if (m:^mozilla/modules/plugin/.*$:) {return '81';}
+if (m:^mozilla/modules/libreg/.*$:) {return '84';}
 if (m:^mozilla/java/webclient/.*$:) {return '127';}
 if (m:^mozilla/content/svg/.*$:) {return '187';}
 if (m:^mozilla/layout/svg/.*$:) {return '187';}
-if (m:^mozilla/modules/libpref/.*$:) {return '82';}
+if (m:^db/sqlite3/.*$:) {return '216';}
+if (m:^storage/.*$:) {return '216';}
+if (m:^mozilla/java/dom/.*$:) {return '130';}
+if (m:^mozilla/extensions/help/.*$:) {return '188';}
+if (m:^mozilla/suite/.*$:) {return '188';}
+if (m:^mozilla/content/xml/.*$:) {return '88';}
+if (m:^mozilla/extensions/xmlextras/.*$:) {return '88';}
+if (m:^mozilla/parser/expat/.*$:) {return '88';}
+if (m:^mozilla/java/util/.*$:) {return '133';}
+if (m:^mozilla/startupcache/.*$:) {return '89';}
+if (m:^mozilla/tools/wizards/.*$:) {return '89';}
+if (m:^mozilla/xpcom/[^/]*$:) {return '89';}
+if (m:^mozilla/xpcom/base/.*$:) {return '89';}
+if (m:^mozilla/xpcom/build/.*$:) {return '89';}
+if (m:^mozilla/xpcom/components/.*$:) {return '89';}
+if (m:^mozilla/xpcom/ds/.*$:) {return '89';}
+if (m:^mozilla/xpcom/glue/.*$:) {return '89';}
+if (m:^mozilla/xpcom/proxy/.*$:) {return '89';}
+if (m:^mozilla/xpcom/sample/.*$:) {return '89';}
+if (m:^mozilla/xpcom/stub/.*$:) {return '89';}
+if (m:^mozilla/xpcom/tests/.*$:) {return '89';}
+if (m:^mozilla/xpcom/threads/.*$:) {return '89';}
+if (m:^mozilla/xpcom/tools/.*$:) {return '89';}
+if (m:^mozilla/xpcom/windbgdlg/.*$:) {return '89';}
+if (m:^mozilla/content/xbl/[^/]*$:) {return '199';}
+if (m:^mozilla/content/xbl/public/.*$:) {return '199';}
+if (m:^mozilla/content/xbl/src/.*$:) {return '199';}
+if (m:^mozilla/webtools/bugzilla/.*$:) {return '190';}
+if (m:^mozilla/xpcom/reflect/xptcall/.*$:) {return '206';}
+if (m:^mozilla/content/xtf/.*$:) {return '200';}
+if (m:^mozilla/layout/xtf/.*$:) {return '200';}
+if (m:^mozilla/gfx/src/xprint/.*$:) {return '179';}
+if (m:^mozilla/gfx/[^/]*$:) {return '201';}
+if (m:^mozilla/gfx/cairo/.*$:) {return '201';}
+if (m:^mozilla/gfx/public/.*$:) {return '201';}
+if (m:^mozilla/gfx/src/[^/]*$:) {return '201';}
+if (m:^mozilla/gfx/src/gtk/.*$:) {return '201';}
+if (m:^mozilla/gfx/src/mac/.*$:) {return '201';}
+if (m:^mozilla/gfx/src/shared/.*$:) {return '201';}
+if (m:^mozilla/gfx/src/thebes/.*$:) {return '201';}
+if (m:^mozilla/gfx/src/windows/.*$:) {return '201';}
+if (m:^mozilla/gfx/thebes/.*$:) {return '201';}
+if (m:^mozilla/modules/lcms/.*$:) {return '201';}
+if (m:^mozilla/view/.*$:) {return '96';}
+if (m:^mozilla/layout/[^/]*$:) {return '98';}
+if (m:^mozilla/layout/base/.*$:) {return '98';}
+if (m:^mozilla/layout/build/.*$:) {return '98';}
+if (m:^mozilla/layout/doc/.*$:) {return '98';}
+if (m:^mozilla/layout/forms/.*$:) {return '98';}
+if (m:^mozilla/layout/generic/.*$:) {return '98';}
+if (m:^mozilla/layout/html/.*$:) {return '98';}
+if (m:^mozilla/layout/macbuild/.*$:) {return '98';}
+if (m:^mozilla/layout/printing/.*$:) {return '98';}
+if (m:^mozilla/layout/tables/.*$:) {return '98';}
+if (m:^mozilla/layout/tools/.*$:) {return '98';}
+if (m:^mozilla/xpinstall/.*$:) {return '150';}
+if (m:^CVSROOT/commitcheck\.pl$:) {return '3';}
+if (m:^CVSROOT/passwd$:) {return '3';}
+if (m:^modules/libjar$:) {return '221';}
+if (m:^mozilla/security/manager/.*$:) {return '151';}
+if (m:^mozilla/layout/style/.*$:) {return '100';}
+if (m:^mozilla/webtools/addons/.*$:) {return '185';}
+if (m:^mozilla/webtools/aus/.*$:) {return '185';}
+if (m:^mozilla/webtools/update/.*$:) {return '185';}
+if (m:^mozilla/js/src/ctypes/.*$:) {return '223';}
+if (m:^mozilla/dbm/.*$:) {return '145';}
+if (m:^mozilla/security/coreconf/.*$:) {return '145';}
+if (m:^mozilla/security/dbm/.*$:) {return '145';}
+if (m:^mozilla/security/jss/.*$:) {return '145';}
+if (m:^mozilla/security/nss/.*$:) {return '145';}
+if (m:^mozilla/security/tinderbox/.*$:) {return '145';}
+if (m:^mozilla/security/tinderlight/.*$:) {return '145';}
+if (m:^mozilla/docshell/.*$:) {return '101';}
+if (m:^mozilla/uriloader/.*$:) {return '101';}
+if (m:^mozilla/webshell/.*$:) {return '101';}
+if (m:^mozilla/mailnews/local/src/nsMovemail.*$:) {return '157';}
+if (m:^mozilla/penelope/$:) {return '225';}
+if (m:^mozilla/composer/.*$:) {return '173';}
+if (m:^mozilla/parser/htmlparser$:) {return '102';}
+if (m:^mozilla/embedding/.*$:) {return '208';}
+if (m:^mozilla/[^/]*$:) {return '19';}
+if (m:^mozilla/tools/README$:) {return '19';}
+if (m:^mozilla/content/base/.*$:) {return '103';}
+if (m:^mozilla/content/events/.*$:) {return '103';}
+if (m:^mozilla/content/html/content/.*$:) {return '103';}
+if (m:^mozilla/content/html/document/.*$:) {return '103';}
+if (m:^mozilla/dom/[^/]*$:) {return '103';}
+if (m:^mozilla/dom/base/.*$:) {return '103';}
+if (m:^mozilla/dom/interfaces/.*$:) {return '103';}
+if (m:^mozilla/dom/locales/.*$:) {return '103';}
+if (m:^mozilla/dom/public/.*$:) {return '103';}
+if (m:^mozilla/dom/src/.*$:) {return '103';}
+if (m:^mozilla/dom/tests/.*$:) {return '103';}
+if (m:^extension/python$:) {return '219';}
+if (m:^mozilla/gfx/src/xlib/.*$:) {return '121';}
+if (m:^mozilla/widget/src/xlib/.*$:) {return '121';}
+if (m:^mozilla/widget/src/xlibxtbin/.*$:) {return '121';}
+if (m:^mozilla/js/rhino/.*$:) {return '138';}
+if (m:^mozilla/string/.*$:) {return '160';}
+if (m:^mozilla/xpcom/string/.*$:) {return '160';}
+if (m:^mozilla/webtools/partytool/.*$:) {return '209';}
+if (m:^mozilla/xpfe/.*$:) {return '137';}
+if (m:^mozilla/widget/src/qt/.*$:) {return '161';}
+if (m:^mozilla/widget/src/gtk/.*$:) {return '49';}
+if (m:^mozilla/widget/src/gtk2/.*$:) {return '49';}
+if (m:^mozilla/widget/src/gtksuperwin/.*$:) {return '49';}
+if (m:^mozilla/widget/src/gtkxtbin/.*$:) {return '49';}
+if (m:^mozilla/js/tests/.*$:) {return '114';}
 }
 if ($b eq 'NSPRPUB_PRE_4_2_CLIENT_BRANCH') {
 if (m:^mozilla/nsprpub/.*$:) {return '146';}

CVSROOT/commitinfo

@@ -13,5 +13,6 @@
 #
 # If the name "ALL" appears as a regular expression it is always used
 # in addition to the first matching regex or "DEFAULT".
-ALL		$CVSROOT/CVSROOT/commitcheck.pl
-ALL		$CVSROOT/CVSROOT/readonlyusers.pl
+#ALL		$CVSROOT/CVSROOT/commitcheck.pl
+#ALL		$CVSROOT/CVSROOT/readonlyusers.pl
+ALL		$CVSROOT/CVSROOT/readonly

CVSROOT/passwd

@@ -26,7 +26,7 @@ ause%sun.com:J7sS6Z5BS4BsA:cvsuser
 axel%pike.org:J0ntXH8PN.yTA:cvsuser
 bbaetz%acm.org:JhmLaLDTsT/h2:cvsuser
 bclary%bclary.com:TYy8zRTOlkZWU:cvsuser
-bear%code-bear.com:QPUD827Visics:cvsuser
+bear%mozilla.com:QPUD827Visics:cvsuser
 beckley%qualcomm.com:oqzqNk6Hm.K52:cvsuser
 benc%meer.net:.mc9O4VQuREws:cvsuser
 beng%bengoodger.com:qP3ON3NucalGw:cvsuser
@@ -38,6 +38,7 @@ biswatosh.chakraborty%sun.com:Cj89QwJpG0/hc:cvsuser
 blassey%mozilla.com:gIEKQwXOhM9z2:cvsuser
 blizzard%mozilla.com:qNva3X2geFCuY:cvsuser
 bmlk%gmx.de:diOpGSeH3syIs:cvsuser
+bobbyholley%gmail.com:UEdaVxj7BVsMY:cvsuser
 brade%comcast.net:ouetdVzWLzsWs:cvsuser
 BradleyJunk%cinci.rr.com:EOOl4wp9MNcU6:cvsuser
 brendan%mozilla.org:N7wZcaY7Bs9nw:cvsadm
@@ -51,6 +52,7 @@ bugzilla%standard8.plus.com:lmzqmqShGzGYs:cvsuser
 burnus%gmx.de:RBozBY9sekJRM:cvsuser
 bz%barnson.org:hRMbA3bW5q6Ak:cvsuser
 bzbarsky%mit.edu:YySJ0ECW0UqcM:cvsuser
+bzrmirror%bugzilla.org:do0ZvZ/z.1YQM:cvsuser
 caillon%redhat.com:S5LpV7HM4OOzo:cvsuser
 callek%gmail.com:7c0ZoYCqNF3qk:cvsuser
 catlee%mozilla.com:eY4mh1o1mljjg:cvsuser
@@ -79,11 +81,12 @@ dbolter%mozilla.com:Pj95SMWINbfQY:cvsuser
 dcamp%mozilla.com:8J1lYA6aDXWgI:cvsuser
 dean_tessman%hotmail.com:AM2BZ7M0nDhlM:cvsuser
 deb%dria.org:tevrBpdIX/IAw:cvsuser
-despotdaemon:zJJgZOGMRo/FE:cvsadm
+despotdaemon:gNFxPV183TGDc:cvsadm
 dholbert%cs.stanford.edu:DP/HW2hXEZoDg:cvsuser
 diegohcg%gmail.com:Vs/1h.ZP6RmZg:cvsuser
 dietrich%mozilla.com:V5GbjeqBWgCQc:cvsuser
-dkl%redhat.com:Jb37f1UZbg4g2:cvsuser
+dlawrence%mozilla.com:Jb37f1UZbg4g2:cvsuser
+dmandelin%mozilla.com:omKcEsk6wjg9s:cvsuser
 dmose%mozilla.org:sTIo1zYddteQc:cvsadm
 dolske%mozilla.com:yYw1gOmZMtaAM:cvsuser
 doronr%us.ibm.com:BntrR9DKOvfRw:cvsuser
@@ -91,9 +94,9 @@ douglas%stebila.ca:FtOKWYCG./BN6:cvsuser
 dougt%meer.net:QzucPi4akyAvo:cvsuser
 driehuis%playbeing.org:BbR6IahGk6yGc:cvsuser
 dschaffe%adobe.com:IVaq/BhZhOKOc:cvsuser
-dtownsend%oxymoronical.com:hhdFeotEGCAG6:cvsuser
+dtownsend%oxymoronical.com:nN8k.deZPkAY6:cvsuser
 dveditz%cruzio.com:S1X7iuOVZr0tI:cvsuser
-dwitte%mozilla.com:sFoUYfKYFCQeg:cvsuser
+dwitte%mozilla.com:atobJ8YkJm/x.:cvsuser
 edburns%acm.org:z7zqfOtPH9oic:cvsuser
 edward.lee%engineering.uiuc.edu:JQQPKcRtozeJY:cvsuser
 ehsan.akhgari%gmail.com:ZAquXcDKuPuNk:cvsuser
@@ -104,7 +107,7 @@ erhyuan%pacbell.net:b6.iRP5wVeO1s:cvsuser
 erik%dasbistro.com:RleOQJ5O4vqSI:cvsuser
 erik%vanderpoel.org:UIUlMPWTelYIE:cvsuser
 Evan.Yan%Sun.COM:y6fet2ZQuQjxw:cvsuser
-fantasai.cvs%inkedblade.net:ZV0ZIUFaokbxg:cvsuser
+fantasai.cvs%inkedblade.net:.wuTh0oK1y23M:cvsuser
 firefox%blakeross.com:iecsxCayirMQw:cvsuser
 flamingice%sourmilk.net:9xh1/DFw2ODOU:cvsuser
 florian%queze.net:fYk7exIMhk3I.:cvsuser
@@ -137,6 +140,7 @@ jay%mozilla.org:./8ppoCBU7xKE:cvsuser
 jdrew%mozilla.com:H94cmzCtc22L6:cvsuser
 jeff.hedlund%matrixsi.com:dUxvk4HDbIrkA:cvsuser
 jgmyers%speakeasy.net:tj/q7ALULIlLM:cvsuser
+jhopkins%mozillamessaging.com:F3Gyejh.h.L3I:cvsuser
 jim_nance%yahoo.com:MW2pItooimXQc:cvsuser
 jmathies%mozilla.com:JMun7n79fcZrE:cvsuser
 jminta%gmail.com:xECVGDTSeqbz2:cvsuser
@@ -170,6 +174,7 @@ kherron%fmailbox.com:rRN9eQFLs3af6:cvsuser
 kieran%eternal.undonet.com:gVVzTaNHTa3HE:cvsuser
 kiko%async.com.br:Uz8pBMTzv6gpo:cvsuser
 kinmoz%netscape.net:RexUJ7MbhHOeE:cvsuser
+klibby%mozilla.com:bQPoQ04OC8s.6:cvsadm
 Kurt.Zenker%sun.com:PxXscXmcBiCWY:cvsuser
 kyle.yuan%sun.com:4pSzbqjeADpcc:cvsuser
 lars%mozilla.com:OIS1qjX2A4hPY:cvsuser
@@ -184,6 +189,7 @@ longsonr%gmail.com:n0H6qvTySWbsY:cvsuser
 lordpixel%mac.com:pBoWsz5/W/1/o:cvsuser
 louie.zhao%sun.com:ajsxRr.217rWY:cvsuser
 lpsolit%gmail.com:s2V0JuW2d3qG.:cvsuser
+lwagner%mozilla.com:nn8UYSg1EVCR6:cvsuser
 marco.zehe%googlemail.com:/.MEQU1hGEtlE:cvsuser
 marco%gnome.org:zKqukw72.KsUw:cvsuser
 mark.finkle%gmail.com:.CMOa5pzz2ey6:cvsuser
@@ -234,6 +240,7 @@ nhosoi%redhat.com:Kc7DN3G6DWNVc:cvsuser
 nick.kreeger%park.edu:8w9jrG44s9v9o:cvsuser
 nkwan%redhat.com:Evx20xUpj8Gk2:cvsuser
 nrthomas%gmail.com:39NAPUEFnNHP.:cvsuser
+olav%bkor.dhs.org:fuDFH7wT/SfrM:cvsuser
 Olli.Pettay%helsinki.fi:JNyNghF5OJ9Xo:cvsuser
 oremj%mozilla.com:Vu3lChH7COMLs:cvsadm
 pamg.bugs%gmail.com:t.cstj7r1wyFo:cvsuser
@@ -284,7 +291,7 @@ sergei_d%fi.tartu.ee:2pMVH6CMfBao6:cvsuser
 sgautherie.bz%free.fr:zRDfcZjqityUw:cvsuser
 sharparrow1%yahoo.com:.ksEGiKJj1sdU:cvsuser
 shaver%mozilla.org:I4.grysVnENVM:cvsadm
-silver%warwickcompsoc.co.uk:w4kdm3lu7ZCUY:cvsuser
+silver%warwickcompsoc.co.uk:jn1zaL3oWEYT6:cvsuser
 simford%yahoo.com:fV41vy16txOL6:cvsuser
 slavomir.katuscak%sun.com:zzZvFAbWtnVt6:cvsuser
 smfr%smfr.org:2mFWUaEqjN7lE:cvsuser
@@ -315,7 +322,6 @@ treydrake%yahoo.com:Y6aSEsZf.GcP2:cvsuser
 ulf%loop.to:nyAdDm7URuxog:cvsuser
 uriber%gmail.com:UbuwPpUMiAJGI:cvsuser
 vitaly%rathedg.com:gCpWN92cgp7aU:cvsuser
-vladd%bugzilla.org:icDVGeWEv1eDw:cvsuser
 vladimir%pobox.com:ZcFYwCPC7dvjE:cvsuser
 wclouser%mozilla.com:7kMqx9pigCvx2:cvsuser
 webmail%kmgerich.com:K7U1HCAoxFv2E:cvsuser

CVSROOT/readonlyusers.pl

@@ -29,7 +29,6 @@ my %read_only_users = (
                        'l10nbld'   => 1,
                        'nobody'    => 1,
                        'stgbld'    => 1,
-                       'tbirdbld'  => 1,
                        'qabld'     => 1,
                        'unittest'  => 1,
                        'trybld'    => 1,

mozilla/Makefile.in

@@ -175,6 +175,9 @@ endif
 SYMBOL_ARCHIVE_BASENAME = \
   $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_ARCH)-$(BUILDID)$(EXTRA_BUILDID)
 
+export SYMBOL_INDEX_NAME = \
+  $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)$(EXTRA_BUILDID)-symbols.txt
+
 buildsymbols:
 ifdef MOZ_CRASHREPORTER
 	echo building symbol store

mozilla/accessible/src/xul/nsXULTabAccessible.cpp

@@ -41,6 +41,7 @@
 #include "nsIDocument.h"
 #include "nsIFrame.h"
 #include "nsIDOMDocument.h"
+#include "nsIDOMDocumentXBL.h"
 #include "nsIDOMXULSelectCntrlEl.h"
 #include "nsIDOMXULSelectCntrlItemEl.h"
 
@@ -167,7 +168,18 @@ nsXULTabAccessible::GetAccessibleRelated(PRUint32 aRelationType,
     NS_ENSURE_TRUE(document, NS_ERROR_FAILURE);
 
     nsCOMPtr<nsIDOMElement> linkedPanel;
-    document->GetElementById(linkedPanelID, getter_AddRefs(linkedPanel));
+    if (content->GetBindingParent()) {
+      nsCOMPtr<nsIDOMDocumentXBL> documentXBL(do_QueryInterface(document));
+      nsCOMPtr<nsIDOMElement> bindingParent =
+        do_QueryInterface(content->GetBindingParent());
+      documentXBL->GetAnonymousElementByAttribute(bindingParent,
+                                                  NS_LITERAL_STRING("id"),
+                                                  linkedPanelID,
+                                                  getter_AddRefs(linkedPanel));
+    }
+    else {
+      document->GetElementById(linkedPanelID, getter_AddRefs(linkedPanel));
+    }
     if (linkedPanel) {
       nsCOMPtr<nsIDOMNode> linkedPanelNode(do_QueryInterface(linkedPanel));
       GetAccService()->GetAccessibleInWeakShell(linkedPanelNode, mWeakShell,

mozilla/browser/app/application.ini

@@ -44,7 +44,7 @@ BuildID=@GRE_BUILDID@
 #ifdef MOZ_SOURCE_STAMP
 SourceStamp=@MOZ_SOURCE_STAMP@
 #endif
-Copyright=Copyright (c) 1998 - 2009 mozilla.org
+Copyright=Copyright (c) 1998 - 2010 mozilla.org
 ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 
 [Gecko]

mozilla/browser/app/blocklist.xml

@@ -11,23 +11,54 @@
     <emItem id="langpack-vi-VN@firefox.mozilla.org">
       <versionRange minVersion="2.0" maxVersion="2.0"/>
     </emItem>
+    <emItem id="masterfiler@gmail.com">
+      <versionRange severity="3"/>
+    </emItem>
     <emItem id="mozilla_cc@internetdownloadmanager.com">
+      <versionRange minVersion=" " maxVersion="6.9.8">
+        <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+           <versionRange minVersion="3.7a1pre" maxVersion="*"/>
+        </targetApplication>
+      </versionRange>
       <versionRange minVersion="2.1" maxVersion="3.3">
         <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
            <versionRange minVersion="3.0a1" maxVersion="*"/>
         </targetApplication>
       </versionRange>
     </emItem>
+    <emItem id="msntoolbar@msn.com">
+      <versionRange minVersion=" " maxVersion="6.*"/>
+    </emItem>
+    <emItem id="personas@christopher.beard">
+      <versionRange minVersion="1.6" maxVersion="1.6">
+        <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+           <versionRange minVersion="3.6" maxVersion="3.6.*"/>
+        </targetApplication>
+      </versionRange>
+    </emItem>
     <emItem id="support@daemon-tools.cc">
       <versionRange minVersion=" " maxVersion="1.0.0.5"/>
     </emItem>
-    <emItem id="{3f963a5b-e555-4543-90e2-c3908898db71}">
-      <versionRange minVersion=" " maxVersion="8.0">
+    <emItem id="yslow@yahoo-inc.com">
+      <versionRange minVersion="2.0.5" maxVersion="2.0.5">
         <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
-           <versionRange minVersion="3.1a1" maxVersion="*"/>
+           <versionRange minVersion="3.5.7" maxVersion="*"/>
         </targetApplication>
       </versionRange>
     </emItem>
+    <emItem id="{2224e955-00e9-4613-a844-ce69fccaae91}"/>
+    <emItem id="{27182e60-b5f3-411c-b545-b44205977502}">
+      <versionRange minVersion="1.0" maxVersion="1.0"/>
+    </emItem>
+    <emItem id="{3252b9ae-c69a-4eaf-9502-dc9c1f6c009e}">
+      <versionRange minVersion="2.2" maxVersion="2.2"/>
+    </emItem>
+    <emItem id="{3f963a5b-e555-4543-90e2-c3908898db71}">
+      <versionRange minVersion=" " maxVersion="8.5"/>
+    </emItem>
+    <emItem id="{46551EC9-40F0-4e47-8E18-8E5CF550CFB8}">
+      <versionRange minVersion="1.1b1" maxVersion="1.1b1"/>
+    </emItem>
     <emItem id="{4B3803EA-5230-4DC3-A7FC-33638F3D3542}">
       <versionRange minVersion="1.2" maxVersion="1.2">
         <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
@@ -35,6 +66,14 @@
         </targetApplication>
       </versionRange>
     </emItem>
+    <emItem id="{8CE11043-9A15-4207-A565-0C94C42D590D}"/>
+    <emItem id="{AB2CE124-6272-4b12-94A9-7303C7397BD1}">
+      <versionRange severity="1"/>
+    </emItem>
+    <emItem id="{B13721C7-F507-4982-B2E5-502A71474FED}">
+      <versionRange severity="1"/>
+    </emItem>
+    <emItem id="{E8E88AB0-7182-11DF-904E-6045E0D72085}"/>
   </emItems>
 <pluginItems>
   <pluginItem>
@@ -56,5 +95,29 @@
       </targetApplication>
     </versionRange>
   </pluginItem>
+  <pluginItem>
+    <match name="filename" exp="NPFFAddOn.dll"/>
+    <versionRange>
+    </versionRange>
+  </pluginItem>
+  <pluginItem>
+    <match name="filename" exp="NPMySrch.dll"/>
+    <versionRange>
+    </versionRange>
+  </pluginItem>
+  <pluginItem>
+    <match name="filename" exp="npViewpoint.dll"/>
+    <versionRange>
+      <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+        <versionRange minVersion="3.0" maxVersion="*"/>
+      </targetApplication>
+    </versionRange>
+  </pluginItem>
+  <pluginItem>
+    <match name="name" exp="[0-6]\.0\.[01]\d{2}\.\d+"/>
+    <match name="filename" exp="npdeploytk.dll"/>
+    <versionRange severity="1">
+    </versionRange>
+  </pluginItem>
 </pluginItems>
 </blocklist>

mozilla/browser/app/macbuild/Contents/Info.plist.in

@@ -74,7 +74,7 @@
 	<key>CFBundleExecutable</key>
 	<string>firefox-bin</string>
 	<key>CFBundleGetInfoString</key>
-	<string>%APP_NAME% %APP_VERSION%, © 1998-2009 Contributors</string>
+	<string>%APP_NAME% %APP_VERSION%, © 1998-2010 Contributors</string>
 	<key>CFBundleIconFile</key>
 	<string>firefox</string>
 	<key>CFBundleIdentifier</key>

mozilla/browser/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in

@@ -1,2 +1,2 @@
 CFBundleName = "%APP_NAME%";
-NSHumanReadableCopyright = "Copyright © 1998-2009 Contributors";
+NSHumanReadableCopyright = "Copyright © 1998-2010 Contributors";

mozilla/browser/app/module.ver

@@ -1,7 +1,7 @@
 WIN32_MODULE_COMPANYNAME=Mozilla Corporation
 WIN32_MODULE_COPYRIGHT=©Firefox and Mozilla Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable.
-WIN32_MODULE_PRODUCTVERSION=3,0,14,0
-WIN32_MODULE_PRODUCTVERSION_STRING=3.0.14pre
+WIN32_MODULE_PRODUCTVERSION=3,0,19,0
+WIN32_MODULE_PRODUCTVERSION_STRING=3.0.19pre
 WIN32_MODULE_TRADEMARKS=Firefox is a Trademark of The Mozilla Foundation.
 WIN32_MODULE_DESCRIPTION=Firefox
 WIN32_MODULE_PRODUCTNAME=Firefox

mozilla/browser/base/content/credits.xhtml

@@ -529,7 +529,7 @@
         <p id="gecko" class="center">&credit.poweredByGeckoReg;</p>
 
         <p class="footnote">
-          &brandFullName;&trade; &license.part0; &copy;1998-2009 &license.part1;
+          &brandFullName;&trade; &license.part0; &copy;1998-2010 &license.part1;
           <a href="" link="about:credits" onclick="visitLink(event);">&license.contrib;</a>,
           &license.part2;
           <a href="" link="about:license" onclick="visitLink(event);">about:license</a>

mozilla/browser/components/feeds/src/FeedWriter.js

@@ -1331,6 +1331,8 @@ FeedWriter.prototype = {
 
   // nsIObserver
   observe: function FW_observe(subject, topic, data) {
+    subject = new XPCNativeWrapper(subject);
+
     if (!this._window) {
       // this._window is null unless this.write was called with a trusted
       // window object.
@@ -1402,6 +1404,8 @@ FeedWriter.prototype = {
 
    // nsINavHistoryService
    onPageChanged: function FW_onPageChanged(aURI, aWhat, aValue) {
+    aURI = new XPCNativeWrapper(aURI);
+
      if (aWhat == Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON) {
        // Go through the readers menu and look for the corresponding
        // reader menu-item for the page if any.

mozilla/browser/components/nsBrowserGlue.js

@@ -489,6 +489,7 @@ BrowserGlue.prototype = {
                      getService(Ci.nsIPrefBranch);
 
     var importBookmarks = false;
+    var importBookmarksHTML = false;
     var restoreDefaultBookmarks = false;
     try {
       restoreDefaultBookmarks = prefBranch.getBoolPref("browser.bookmarks.restore_default_bookmarks");
@@ -502,7 +503,8 @@ BrowserGlue.prototype = {
     }
     else {
       try {
-        importBookmarks = prefBranch.getBoolPref("browser.places.importBookmarksHTML");
+        importBookmarks = importBookmarksHTML =
+          prefBranch.getBoolPref("browser.places.importBookmarksHTML");
       } catch(ex) {}
     }
 
@@ -546,11 +548,12 @@ BrowserGlue.prototype = {
           // Report the error, but ignore it.
           Cu.reportError(err);
         }
-        prefBranch.setBoolPref("browser.places.importBookmarksHTML", false);
-        if (restoreDefaultBookmarks)
-          prefBranch.setBoolPref("browser.bookmarks.restore_default_bookmarks",
-                                 false);
       }
+      if (importBookmarksHTML)
+        prefBranch.setBoolPref("browser.places.importBookmarksHTML", false);
+      if (restoreDefaultBookmarks)
+        prefBranch.setBoolPref("browser.bookmarks.restore_default_bookmarks",
+                               false);
     }
 
     // Initialize bookmark archiving on idle.

mozilla/browser/components/places/content/places.js

@@ -538,11 +538,7 @@ var PlacesOrganizer = {
     var backupsDir = dirSvc.get("Desk", Ci.nsILocalFile);
     fp.displayDirectory = backupsDir;
 
-    // Use YYYY-MM-DD (ISO 8601) as it doesn't contain illegal characters
-    // and makes the alphabetical order of multiple backup files more useful.
-    var date = (new Date).toLocaleFormat("%Y-%m-%d");
-    fp.defaultString = PlacesUIUtils.getFormattedString("bookmarksBackupFilenameJSON",
-                                                        [date]);
+    fp.defaultString = PlacesUtils.getBackupFilename();
 
     if (fp.show() != Ci.nsIFilePicker.returnCancel) {
       PlacesUtils.backupBookmarksToFile(fp.file, [PlacesUIUtils.leftPaneFolderId]);
@@ -551,9 +547,7 @@ var PlacesOrganizer = {
       var latestBackup = PlacesUtils.getMostRecentBackup();
       if (!latestBackup || latestBackup != fp.file) {
         latestBackup.remove(false);
-        var date = new Date().toLocaleFormat("%Y-%m-%d");
-        var name = PlacesUtils.getFormattedString("bookmarksArchiveFilename",
-                                                  [date]);
+        var name = PlacesUtils.getBackupFilename();
         fp.file.copyTo(this.bookmarksBackupDir, name);
       }
     }

mozilla/browser/components/sessionstore/src/nsSessionStore.js

@@ -379,8 +379,13 @@ SessionStoreService.prototype = {
         break;
       case "TabOpen":
       case "TabClose":
-        var panelID = aEvent.originalTarget.linkedPanel;
-        var tabpanel = aEvent.originalTarget.ownerDocument.getElementById(panelID);
+        let target = aEvent.originalTarget;
+        let panelID = target.linkedPanel;
+        let ownerDoc = target.ownerDocument;
+        let bindingParent = ownerDoc.getBindingParent(target);
+        let tabpanel =
+          ownerDoc.getAnonymousElementByAttribute(bindingParent, "id",
+                                                  panelID);
         if (aEvent.type == "TabOpen") {
           this.onTabAdd(aEvent.currentTarget.ownerDocument.defaultView, tabpanel);
         }

mozilla/browser/config/version.txt

@@ -1 +1 @@
-3.0.14pre
+3.0.19pre

mozilla/browser/installer/removed-files.in

@@ -641,3 +641,24 @@ components/aboutCertError.js
 #else
 xpicleanup
 #endif
+#ifdef XP_WIN
+# Files added by 3.6 that need to be removed by the win32 installer on downgrade
+components/components.list
+components/GPSDGeolocationProvider.js
+components/nsFormAutoComplete.js
+components/nsPlacesAutoComplete.js
+components/nsUpdateServiceStub.js
+components/nsUpdateTimerManager.js
+extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+modules/CertUtils.jsm
+modules/ctypes.jsm
+modules/FileUtils.jsm
+modules/LightweightThemeConsumer.jsm
+modules/LightweightThemeManager.jsm
+modules/NetUtil.jsm
+modules/NetworkPrioritizer.jsm
+modules/WindowsPreviewPerTab.jsm
+res/broken-image.png
+res/loading-image.png
+#endif

mozilla/browser/locales/en-US/chrome/browser/aboutDialog.dtd

@@ -4,6 +4,6 @@
 <!ENTITY aboutLink              "&lt; About &brandFullName;">
 <!ENTITY aboutLink.accesskey    "A">
 <!ENTITY aboutVersion           "version">
-<!ENTITY copyrightInfo          "&#169;1998-2009 Contributors. All Rights Reserved. Firefox and the 
+<!ENTITY copyrightInfo          "&#169;1998-2010 Contributors. All Rights Reserved. Firefox and the 
                                  Firefox logos are trademarks of the Mozilla Foundation.  All rights 
                                  reserved.">

mozilla/camino/Info-Camino.plist.in

@@ -8,6 +8,8 @@
 	<string>0</string>
 	<key>BreakpadRequestComments</key>
 	<string>YES</string>
+	<key>BreakpadRequestEmail</key>
+	<string>YES</string>
 	<key>BreakpadServerParameters</key>
 	<dict>
 		<key>BuildID</key>
@@ -108,6 +110,18 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeIconFile</key>
+			<string>fileBookmark.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Camino bookmark</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>org.mozilla.camino.bookmark</string>
+			</array>
+		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>Camino</string>
@@ -226,29 +240,35 @@
 	<%APP_UPDATES_ENABLED%/>
 	<key>SUExpectsDSASignature</key>
 	<true/>
-	<key>SUPublicDSAKey</key>
-	<string>-----BEGIN PUBLIC KEY-----
-MIIDOjCCAi0GByqGSM44BAEwggIgAoIBAQDQ4Easn8ybXNil3l8UXWHnu2s7Q4Kk
-uXXMZ2V/l8LLrQ3AlaH/7CZoUKY+LtpmPHL57yHvFWQIxJGz4BwkFBgt+4Yvw2Lh
-miXi2sMSKK721sXkoPZO3iQsdSIav0A//B2EWM3wCya3LY8V7Pwd06hIGErG+2sR
-Zm7oqyCZvC2f8jjradkGzOKssOWm1TaLHL230u65lf9roTVG0UCFSPcgN29u0u7v
-OGiYlkTqsE0Dv4hi4QxxJQk2mn7dJYcNRnkbciaxCSdcqPMvIg0DPL300C3YfaCu
-dDAHlCj70kZSp2m2jGZQFwGyZ82xu6QjE3ocTG7mjHJSTG2cmeSn2cFDAhUAxjIm
-aMWtvHGo5Rxcn09EzZvqa28CggEAA0bvQnqr3ekK8Tuy3GbqOQxQahOmLmjKKDfT
-3QXYPMt+pyWh5Eoay1uCpZtc99PXqWDg1dN0LVRFu2M9S8iTeNNCtQ42E0Hm1oNs
-J0SQa1lf2/rMr+xwIj0kJtpr+uvYTPPoSJgPOXa/W/5o0b/VCRCT8QXqvQMmd++B
-ZFkf9pLVh8eH/Gfa5abLcLGDR2kWsRA4vra+cZJbMDKxfB3MsI125ejBhb698ltv
-dHHUIxm/e92+r6pP73/EC9SwgjtFQWBL4ZjBZg6kdhHdw6WIWVRDsZTvdquK5B7g
-I5NMqJyl/eaTGnKD+Q349GeQtdnc2txUGxeMb83SWulPgEZNZQOCAQUAAoIBAHva
-7XzuaZiAvgnIGFuSA61tO3nIT7CtLbgMqRPBBGoIh9qG+JcQNOQ5BAtq839mP1FC
-nOXEajr3UDO5tKn4V3Y3X/jCjwDLZHIP+Y5m/cvVm50tSrBIfT2G5pUrGd9cSEDG
-XfYOEaMdGVa9aLBrSo9739WVbWg7UIEqb0D2a3nBo16JDSyn9H7Hcq2cjWJugQZ6
-UM2UtHwvaK/NHAcprjANQuYQ78U4GapNnuLIXx1EBru8gSKHlcyeOu9fa79oAhvN
-xz+k1ujre1mK8oq2DT2kCo29Ufgsc6U5bCc2Bs7S/fHOVBjxUf9/XIfvOyJRCbVJ
-2hR9h9Vj9Fd3jEyXbQA=
------END PUBLIC KEY-----</string>
+	<key>SUFeedURL</key>
+	<string>https://</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>camino_dsa_pub.pem</string>
 	<key>SUScheduledCheckInterval</key>
 	<integer>86400</integer>
+	<key>UTExportedTypeDeclarations</key>
+	<array>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>com.apple.safari.bookmark</string>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Camino bookmark</string>
+			<key>UTTypeIconFile</key>
+			<string>fileBookmark.icns</string>
+			<key>UTTypeIdentifier</key>
+			<string>org.mozilla.camino.bookmark</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>caminobookmark</string>
+				</array>
+			</dict>
+		</dict>
+	</array>
 	<key>mozProfileDirName</key>
 	<string>Camino</string>
 </dict>

mozilla/camino/Info-Importer.plist

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>MDImporter</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>org.mozilla.camino.bookmark</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>org.mozilla.camino.spotlightimporter</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleVersion</key>
+	<string>${PRODUCT_VERSION_STRING}</string>
+	<key>CFPlugInDynamicRegisterFunction</key>
+	<string></string>
+	<key>CFPlugInDynamicRegistration</key>
+	<string>NO</string>
+	<key>CFPlugInFactories</key>
+	<dict>
+		<key>FE75FA4A-AFDC-4DE2-912A-9860E3870F20</key>
+		<string>MetadataImporterPluginFactory</string>
+	</dict>
+	<key>CFPlugInTypes</key>
+	<dict>
+		<key>8B08C4BF-415B-11D8-B3F9-0003936726FC</key>
+		<array>
+			<string>FE75FA4A-AFDC-4DE2-912A-9860E3870F20</string>
+		</array>
+	</dict>
+	<key>CFPlugInUnloadFunction</key>
+	<string></string>
+</dict>
+</plist>

mozilla/camino/Makefile.in

@@ -49,6 +49,7 @@ DIRS = \
 	flashblock \
 	idl \
 	pinstripe \
+	places \
 	striptease \
 	safebrowsing \
 	$(NULL)
@@ -74,7 +75,7 @@ APP_UPDATE_URL = https://caminobrowser.org/update-check
 APP_UPDATES_ENABLED = true
 BREAKPAD_UPLOAD_URL = https://crash-reports.mozilla.com/submit
 else
-APP_UPDATES_ENABLED = false
+APP_UPDATES_ENABLED ?= false
 endif
 
 # For Launch Services compatibility, CFBundleVersion can be at most three
@@ -148,39 +149,21 @@ STRINGS_FILES = \
 GENERATED_STRINGS_FILES = $(patsubst %,generated/%,$(STRINGS_FILES))
 
 GECKO_STRINGS_FILES = \
-	resources/localized/English.lproj/communicator_locale_typeaheadfind_properties.strings \
+	resources/localized/English.lproj/global-platform_locale_intl_properties.strings \
 	resources/localized/English.lproj/global-region_locale_region_properties.strings \
 	resources/localized/English.lproj/global_locale_appstrings_properties.strings \
-	resources/localized/English.lproj/global_locale_charsetTitles_properties.strings \
 	resources/localized/English.lproj/global_locale_commonDialogs_properties.strings \
 	resources/localized/English.lproj/global_locale_config_properties.strings \
 	resources/localized/English.lproj/global_locale_crashes_properties.strings \
 	resources/localized/English.lproj/global_locale_css_properties.strings \
-	resources/localized/English.lproj/global_locale_dialog_properties.strings \
 	resources/localized/English.lproj/global_locale_dom_dom_properties.strings \
-	resources/localized/English.lproj/global_locale_global-strres_properties.strings \
-	resources/localized/English.lproj/global_locale_keys_properties.strings \
-	resources/localized/English.lproj/global_locale_languageNames_properties.strings \
 	resources/localized/English.lproj/global_locale_layout_HtmlForm_properties.strings \
 	resources/localized/English.lproj/global_locale_layout_MediaDocument_properties.strings \
 	resources/localized/English.lproj/global_locale_layout_errors_properties.strings \
 	resources/localized/English.lproj/global_locale_layout_xmlparser_properties.strings \
-	resources/localized/English.lproj/global_locale_nsHelperAppDlg_properties.strings \
-	resources/localized/English.lproj/global_locale_nsProgressDialog_properties.strings \
-	resources/localized/English.lproj/global_locale_nsTreeSorting_properties.strings \
-	resources/localized/English.lproj/global_locale_nsWebBrowserPersist_properties.strings \
 	resources/localized/English.lproj/global_locale_plugins_properties.strings \
-	resources/localized/English.lproj/global_locale_printPageSetup_properties.strings \
-	resources/localized/English.lproj/global_locale_printdialog_properties.strings \
-	resources/localized/English.lproj/global_locale_printing_properties.strings \
 	resources/localized/English.lproj/global_locale_prompts_properties.strings \
-	resources/localized/English.lproj/global_locale_regionNames_properties.strings \
-	resources/localized/English.lproj/global_locale_security_caps_properties.strings \
-	resources/localized/English.lproj/global_locale_storage_properties.strings \
-	resources/localized/English.lproj/global_locale_tabbrowser_properties.strings \
-	resources/localized/English.lproj/global_locale_xbl_properties.strings \
 	resources/localized/English.lproj/global_locale_xslt_xslt_properties.strings \
-	resources/localized/English.lproj/global_locale_xul_properties.strings \
 	resources/localized/English.lproj/necko_locale_necko_properties.strings \
 	resources/localized/English.lproj/pipnss_locale_nsserrors_properties.strings \
 	resources/localized/English.lproj/pipnss_locale_pipnss_properties.strings \
@@ -194,7 +177,7 @@ CAMINO_SYMBOL_SOURCE_FILES = \
 	$(XCODE_PRODUCT_DIR)/*.dSYM/Contents/Resources/DWARF/* \
 	google-breakpad/src/client/mac/build/Release/Breakpad.framework.dSYM/Contents/Resources/DWARF/Breakpad \
 	google-breakpad/src/client/mac/build/Release/breakpadUtilities.dylib.dSYM/Contents/Resources/DWARF/breakpadUtilities.dylib \
-	growl/build/Deployment/Growl.framework.dSYM/Contents/Resources/DWARF/Growl \
+	growl/build/Release/Growl.framework.dSYM/Contents/Resources/DWARF/Growl \
 	sparkle/build/Release/Sparkle.framework.dSYM/Contents/Resources/DWARF/Sparkle \
 	$(NULL)
 

mozilla/camino/PreferencePanes/Appearance/Appearance.h

@@ -62,16 +62,12 @@
   IBOutlet NSTextField*   mFontSampleMonospace;
 
   IBOutlet NSTextField*   mProportionalSampleLabel;
-  IBOutlet NSTextField*   mProportionalSubLabel;
 
+  IBOutlet NSPopUpButton* mMinFontSizePopup;
+  IBOutlet NSMatrix*      mDefaultFontMatrix;
   IBOutlet NSButton*      mUseMyFontsCheckbox;
 
-  // advanced panel stuff
-  IBOutlet NSPanel*       mAdvancedFontsDialog;
-  IBOutlet NSPopUpButton* mMinFontSizePopup;
-  IBOutlet NSTextField*   mAdvancedFontsLabel;
-
-  IBOutlet NSMatrix*      mDefaultFontMatrix;
+  IBOutlet NSView*        mPreviousBottomControl;
 
   NSArray*                mRegionMappingTable;
 
@@ -93,8 +89,8 @@
 - (IBAction)monospaceFontChoiceButtonClicked:(id)sender;
 - (IBAction)fontRegionPopupClicked:(id)sender;
 
-- (IBAction)showAdvancedFontsDialog:(id)sender;
-- (IBAction)advancedFontsDone:(id)sender;
+- (IBAction)minFontSizePopupClicked:(id)sender;
+- (IBAction)defaultFontTypeClicked:(id)sender;
 
 - (IBAction)resetToDefaults:(id)sender;
 

mozilla/camino/PreferencePanes/Appearance/Appearance.mm

@@ -71,6 +71,7 @@
 - (void)setFontSampleOfType:(NSString*)fontType withFont:(NSFont*)font andDict:(NSDictionary*)regionDict;
 - (void)saveFont:(NSFont*)font toDict:(NSMutableDictionary*)regionDict forType:(NSString*)fontType;
 
+- (void)updateAdvancedFontControls;
 - (void)updateFontSampleOfType:(NSString*)fontType;
 - (NSTextField*)fontSampleForType:(NSString*)fontType;
 - (NSString*)fontSizeType:(NSString*)fontType;
@@ -130,13 +131,6 @@
   [super dealloc];
 }
 
-- (id)initWithBundle:(NSBundle*)bundle
-{
-  self = [super initWithBundle:bundle];
-  mFontButtonForEditor = nil;
-  return self;
-}
-
 - (void)mainViewDidLoad
 {
   // should save and restore this
@@ -162,6 +156,7 @@
 
   [self loadFontPrefs];
   [self updateFontPreviews];
+  [self updateAdvancedFontControls];
 }
 
 - (void)didUnselect
@@ -170,8 +165,28 @@
   [self saveFontPrefs];
 }
 
+// The colors and fonts tab views are different heights. We need to resize
+// the window when each is selected so the spacing looks correct.
 - (void)tabView:(NSTabView*)tabView didSelectTabViewItem:(NSTabViewItem*)tabViewItem
 {
+  NSControl* bottomControl = nil;
+  if ([[tabViewItem identifier] isEqualToString:@"colors"])
+    bottomControl = mUseMyColorsCheckbox;
+  else if ([[tabViewItem identifier] isEqualToString:@"fonts"])
+    bottomControl = mUseMyFontsCheckbox;
+
+  if (bottomControl && bottomControl != mPreviousBottomControl) {
+    NSWindow* prefsWindow = [mTabView window];
+    float heightChange = [mPreviousBottomControl frame].origin.y -
+                           [bottomControl frame].origin.y;
+
+    NSRect windowFrame = [prefsWindow frame];
+    windowFrame.size.height += heightChange;
+    windowFrame.origin.y -= heightChange;
+    [prefsWindow setFrame:windowFrame display:YES animate:[prefsWindow isVisible]];
+
+    mPreviousBottomControl = bottomControl;
+  }
 }
 
 - (void)setupFontRegionPopup
@@ -248,6 +263,7 @@
 {
   // save the old values
   [self updateFontPreviews];
+  [self updateAdvancedFontControls];
 }
 
 - (void)loadFontPrefs
@@ -656,15 +672,6 @@
   NSString* propLabelString = [NSString stringWithFormat:[self localizedStringForKey:@"ProportionalLabelFormat"],
                                                          [self localizedStringForKey:defaultFontType]];
   [mProportionalSampleLabel setStringValue:propLabelString];
-  
-  NSString* sublabelValue = [self localizedStringForKey:[defaultFontType stringByAppendingString:@"_note"]];
-  [mProportionalSubLabel setStringValue:sublabelValue];
-
-  NSString* noteFontExample = [defaultFontType isEqualToString:@"serif"] ? @"Times" : @"Helvetica";
-  [mProportionalSubLabel setFont:[[NSFontManager sharedFontManager] fontWithFamily:noteFontExample
-                                                                            traits:0
-                                                                            weight:5 /* normal weight */
-                                                                              size:[[mProportionalSubLabel font] pointSize]]];
 
   [self setupFontSamplesFromDict:regionDict];
 }
@@ -674,15 +681,11 @@
 const int kDefaultFontSerifTag = 0;
 const int kDefaultFontSansSerifTag = 1;
 
-- (IBAction)showAdvancedFontsDialog:(id)sender
+- (void)updateAdvancedFontControls
 {
   NSDictionary* regionDict = [self settingsForCurrentRegion];
   if (!regionDict) return;
 
-  NSString* advancedLabel = [NSString stringWithFormat:[self localizedStringForKey:@"AdditionalFontsLabelFormat"],
-                                                       [regionDict objectForKey:@"region"]];
-  [mAdvancedFontsLabel setStringValue:advancedLabel];
-  
   // set up min size popup
   int itemIndex = 0;
   NSMutableDictionary* fontSizeDict = [regionDict objectForKey:@"fontsize"];
@@ -693,24 +696,14 @@ const int kDefaultFontSansSerifTag = 1;
       itemIndex = 0;
   }
   [mMinFontSizePopup selectItemAtIndex:itemIndex];
-  
+
   // set up default font radio buttons (default to serif)
   NSString* defaultFontType = [self defaultProportionalFontTypeForCurrentRegion];
   [mDefaultFontMatrix selectCellWithTag:([defaultFontType isEqualToString:@"sans-serif"] ? kDefaultFontSansSerifTag : kDefaultFontSerifTag)];
-  
-  mFontPanelWasVisible = [[NSFontPanel sharedFontPanel] isVisible];
-  [[NSFontPanel sharedFontPanel] orderOut:nil];
-  
-  [NSApp beginSheet:mAdvancedFontsDialog
-     modalForWindow:[mTabView window] // any old window accessor
-      modalDelegate:self
-     didEndSelector:@selector(advancedFontsSheetDidEnd:returnCode:contextInfo:)
-        contextInfo:NULL];
 }
 
-- (IBAction)advancedFontsDone:(id)sender
+- (IBAction)minFontSizePopupClicked:(id)sender
 {
-  // save settings
   NSDictionary* regionDict = [self settingsForCurrentRegion];
   if (!regionDict) return;
 
@@ -719,21 +712,21 @@ const int kDefaultFontSansSerifTag = 1;
   NSMutableDictionary* fontSizeDict = [regionDict objectForKey:@"fontsize"];
   [fontSizeDict setObject:[NSNumber numberWithInt:(int)minSize] forKey:@"minimum"];
 
-  // Save the default font type.
+  [self saveFontSizePrefsForRegion:regionDict];
+  [self updateFontPreviews];
+}
+
+- (IBAction)defaultFontTypeClicked:(id)sender
+{
+  NSDictionary* regionDict = [self settingsForCurrentRegion];
+  if (!regionDict) return;
+
   NSMutableDictionary* defaultFontTypeDict = [regionDict objectForKey:@"defaultFontType"];
   NSString* defaultFontType = ([[mDefaultFontMatrix selectedCell] tag] == kDefaultFontSerifTag) ? @"serif" : @"sans-serif";
   [defaultFontTypeDict setObject:defaultFontType forKey:@"type"];
-  
-  [mAdvancedFontsDialog orderOut:self];
-  [NSApp endSheet:mAdvancedFontsDialog];
-
-  // Apply the changes for the current region.
-  [self saveAllFontPrefsForRegion:regionDict];
 
+  [self saveDefaultFontTypePrefForRegion:regionDict];
   [self updateFontPreviews];
-
-  if (mFontPanelWasVisible)
-     [[NSFontPanel sharedFontPanel] makeKeyAndOrderFront:self];    
 }
 
 - (IBAction)resetToDefaults:(id)sender {
@@ -798,13 +791,10 @@ const int kDefaultFontSansSerifTag = 1;
   // Update the UI. Order is important here -- syncing the font panel depends on the
   // font previews being correct.
   [self updateFontPreviews];
+  [self updateAdvancedFontControls];
   [mUseMyFontsCheckbox setState:[self useMyFontsPref]];
 }
 
-- (void)advancedFontsSheetDidEnd:(NSWindow*)sheet returnCode:(int)returnCode contextInfo:(void*)contextInfo
-{
-}
-
 @end
 
 @implementation OrgMozillaCaminoPreferenceAppearance (FontManagerDelegate)
@@ -839,10 +829,6 @@ const int kDefaultFontSansSerifTag = 1;
 
 - (void)changeFont:(id)sender
 {
-  // Ignore font panel changes if the advanced panel is up.
-  if ([mAdvancedFontsDialog isVisible])
-    return;
-  
   NSDictionary* regionDict = [self settingsForCurrentRegion];
 
   if (mFontButtonForEditor == mChooseProportionalFontButton) {

mozilla/camino/PreferencePanes/Appearance/English.lproj/Appearance.nib/classes.nib

@@ -1,83 +1,144 @@
-{
-    IBClasses =     (
-                {
-            CLASS = FirstResponder;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSObject;
-        },
-                {
-            CLASS = NSMenu;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSObject;
-        },
-                {
-            CLASS = NSMenuItem;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSObject;
-        },
-                {
-            CLASS = NSObject;
-            LANGUAGE = ObjC;
-        },
-                {
-            CLASS = NSPreferencePane;
-            LANGUAGE = ObjC;
-            OUTLETS =             {
-                "_firstKeyView" = id;
-                "_initialKeyView" = id;
-                "_lastKeyView" = id;
-                "_window" = id;
-            };
-            SUPERCLASS = NSObject;
-        },
-                {
-            CLASS = NSView;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSResponder;
-        },
-                {
-            ACTIONS =             {
-                advancedFontsDone = id;
-                buttonClicked = id;
-                colorChanged = id;
-                fontRegionPopupClicked = id;
-                monospaceFontChoiceButtonClicked = id;
-                proportionalFontChoiceButtonClicked = id;
-                resetToDefaults = id;
-                showAdvancedFontsDialog = id;
-                useMyFontsButtonClicked = id;
-            };
-            CLASS = OrgMozillaCaminoPreferenceAppearance;
-            LANGUAGE = ObjC;
-            OUTLETS =             {
-                mAdvancedFontsDialog = NSPanel;
-                mAdvancedFontsLabel = NSTextField;
-                mBackgroundColorWell = NSColorWell;
-                mChooseMonospaceFontButton = NSButton;
-                mChooseProportionalFontButton = NSButton;
-                mDefaultFontMatrix = NSMatrix;
-                mFontRegionPopup = NSPopUpButton;
-                mFontSampleMonospace = NSTextField;
-                mFontSampleProportional = NSTextField;
-                mMinFontSizePopup = NSPopUpButton;
-                mProportionalSampleLabel = NSTextField;
-                mProportionalSubLabel = NSTextField;
-                mResetButton = NSButton;
-                mTabView = NSTabView;
-                mTextColorWell = NSColorWell;
-                mUnderlineLinksCheckbox = NSButton;
-                mUnvisitedLinksColorWell = NSColorWell;
-                mUseMyColorsCheckbox = NSButton;
-                mUseMyFontsCheckbox = NSButton;
-                mVisitedLinksColorWell = NSColorWell;
-            };
-            SUPERCLASS = PreferencePaneBase;
-        },
-                {
-            CLASS = PreferencePaneBase;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSPreferencePane;
-        }
-    );
-    IBVersion = 1;
-}
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBClasses</key>
+	<array>
+		<dict>
+			<key>CLASS</key>
+			<string>PreferencePaneBase</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSPreferencePane</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSMenuItem</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSMenu</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>FirstResponder</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSObject</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSPreferencePane</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>_firstKeyView</key>
+				<string>id</string>
+				<key>_initialKeyView</key>
+				<string>id</string>
+				<key>_lastKeyView</key>
+				<string>id</string>
+				<key>_window</key>
+				<string>id</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
+			<key>ACTIONS</key>
+			<dict>
+				<key>buttonClicked</key>
+				<string>id</string>
+				<key>colorChanged</key>
+				<string>id</string>
+				<key>defaultFontTypeClicked</key>
+				<string>id</string>
+				<key>fontRegionPopupClicked</key>
+				<string>id</string>
+				<key>minFontSizePopupClicked</key>
+				<string>id</string>
+				<key>monospaceFontChoiceButtonClicked</key>
+				<string>id</string>
+				<key>proportionalFontChoiceButtonClicked</key>
+				<string>id</string>
+				<key>resetToDefaults</key>
+				<string>id</string>
+				<key>useMyFontsButtonClicked</key>
+				<string>id</string>
+			</dict>
+			<key>CLASS</key>
+			<string>OrgMozillaCaminoPreferenceAppearance</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>mBackgroundColorWell</key>
+				<string>NSColorWell</string>
+				<key>mChooseMonospaceFontButton</key>
+				<string>NSButton</string>
+				<key>mChooseProportionalFontButton</key>
+				<string>NSButton</string>
+				<key>mDefaultFontMatrix</key>
+				<string>NSMatrix</string>
+				<key>mFontRegionPopup</key>
+				<string>NSPopUpButton</string>
+				<key>mFontSampleMonospace</key>
+				<string>NSTextField</string>
+				<key>mFontSampleProportional</key>
+				<string>NSTextField</string>
+				<key>mMinFontSizePopup</key>
+				<string>NSPopUpButton</string>
+				<key>mPreviousBottomControl</key>
+				<string>NSView</string>
+				<key>mProportionalSampleLabel</key>
+				<string>NSTextField</string>
+				<key>mResetButton</key>
+				<string>NSButton</string>
+				<key>mTabView</key>
+				<string>NSTabView</string>
+				<key>mTextColorWell</key>
+				<string>NSColorWell</string>
+				<key>mUnderlineLinksCheckbox</key>
+				<string>NSButton</string>
+				<key>mUnvisitedLinksColorWell</key>
+				<string>NSColorWell</string>
+				<key>mUseMyColorsCheckbox</key>
+				<string>NSButton</string>
+				<key>mUseMyFontsCheckbox</key>
+				<string>NSButton</string>
+				<key>mVisitedLinksColorWell</key>
+				<string>NSColorWell</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>PreferencePaneBase</string>
+		</dict>
+	</array>
+	<key>IBVersion</key>
+	<string>1</string>
+</dict>
+</plist>

mozilla/camino/PreferencePanes/Appearance/English.lproj/Appearance.nib/info.nib

@@ -2,16 +2,18 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>IBDocumentLocation</key>
-	<string>69 14 356 240 0 0 1440 878 </string>
 	<key>IBFramework Version</key>
-	<string>489.0</string>
+	<string>677</string>
 	<key>IBLastKnownRelativeProjectPath</key>
 	<string>../../../Camino.xcodeproj</string>
 	<key>IBOldestOS</key>
 	<integer>4</integer>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>107</integer>
+	</array>
 	<key>IBSystem Version</key>
-	<string>9J61</string>
+	<string>9L31a</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>

mozilla/camino/PreferencePanes/Appearance/English.lproj/Localizable.strings.in

@@ -5,9 +5,6 @@
 "ProportionalLabelFormat" = "Proportional (%@):";
 "serif" = "Serif";
 "sans-serif" = "Sans-serif";
-"AdditionalFontsLabelFormat" = "Additional fonts for %@ pages";
-"serif_note" = "(like Times)";
-"sans-serif_note" = "(like Helvetica)";
 
 /* Displayed when there is no font specified in prefs for a given language group and type */
 "NoFontSelected" = "No font selected";

mozilla/camino/PreferencePanes/Privacy/PrivacyPane.mm

@@ -48,9 +48,6 @@
 @interface CookieDateFormatter : NSDateFormatter
 @end
 
-// prefs for keychain password autofill
-static const char* const kUseKeychainPref = "chimera.store_passwords_with_keychain";
-
 // sort order indicators
 const int kSortReverse = 1;
 
@@ -168,7 +165,8 @@ const int kSortReverse = 1;
     [mAskAboutCookies setState:NSMixedState];
 
   // Keychain checkbox
-  BOOL storePasswords = [self getBooleanPref:kUseKeychainPref withSuccess:NULL];
+  BOOL storePasswords = [self getBooleanPref:kGeckoPrefUseKeychain
+                                 withSuccess:NULL];
   [mStorePasswords setState:(storePasswords ? NSOnState : NSOffState)];
 }
 
@@ -189,7 +187,8 @@ const int kSortReverse = 1;
 
 - (IBAction)clickStorePasswords:(id)sender
 {
-  [self setPref:kUseKeychainPref toBoolean:([mStorePasswords state] == NSOnState)];
+  [self setPref:kGeckoPrefUseKeychain
+      toBoolean:([mStorePasswords state] == NSOnState)];
 }
 
 - (IBAction)launchKeychainAccess:(id)sender
@@ -295,7 +294,8 @@ const int kSortReverse = 1;
     int rowToSelect = [selectedIndexes lastIndex] - ([selectedIndexes count] - 1);
     if ((rowToSelect < 0) || (rowToSelect >= [mCookiesTable numberOfRows]))
       rowToSelect = [mCookiesTable numberOfRows] - 1;
-    [mCookiesTable selectRow:rowToSelect byExtendingSelection:NO];
+    [mCookiesTable selectRowIndexes:[NSIndexSet indexSetWithIndex:rowToSelect]
+                                             byExtendingSelection:NO];
   }
 }
 
@@ -332,17 +332,9 @@ const int kSortReverse = 1;
 
 - (IBAction)removeCookiesAndBlockSites:(id)aSender
 {
-  // Block the sites...
-  CHPermissionManager* permManager = [CHPermissionManager permissionManager];
-  NSArray* selectedSites = [self selectedCookieSites];
-  NSEnumerator* sitesEnum = [selectedSites objectEnumerator];
-  NSString* curSite;
-  while ((curSite = [sitesEnum nextObject])) {
-    [permManager setPolicy:CHPermissionDeny
-                    forHost:curSite
-                      type:CHPermissionTypeCookie];
-  }
-
+  // Block the selected sites...
+  [self addPermissionForSelection:CHPermissionDeny];
+  
   // ...then remove the cookies.
   [self removeCookies:aSender];
 }
@@ -365,17 +357,16 @@ const int kSortReverse = 1;
 - (void)addPermissionForSelection:(int)inPermission
 {
   CHPermissionManager* permManager = [CHPermissionManager permissionManager];
-  NSIndexSet* selectedIndexes = [mCookiesTable selectedRowIndexes];
-  for (unsigned int index = [selectedIndexes lastIndex];
-       index != NSNotFound;
-       index = [selectedIndexes indexLessThanIndex:index])
-  {
-    NSString* host = [[mCookies objectAtIndex:index] domain];
-    if ([host hasPrefix:@"."] && [host length] > 1)
-      host = [host substringFromIndex:1];
-    [permManager setPolicy:inPermission
-                   forHost:host
-                      type:CHPermissionTypeCookie];
+  NSArray* selectedSites = [self selectedCookieSites];
+  NSEnumerator* sitesEnum = [selectedSites objectEnumerator];
+  NSString* curSite;
+  while ((curSite = [sitesEnum nextObject])) {
+    NSString* curHost = [self permissionsBlockingNameForCookieHostname:curSite];
+    if ([curHost length] > 0) {
+      [permManager setPolicy:inPermission
+                     forHost:curHost
+                        type:CHPermissionTypeCookie];
+    }
   }
 }
 
@@ -480,7 +471,8 @@ const int kSortReverse = 1;
   if ([mPermissionsTable numberOfRows] > 0) {
     int rowToSelect = [self rowForPermissionWithHost:superdomain];
     if ((rowToSelect >= 0) && (rowToSelect < [mPermissionsTable numberOfRows])) {
-      [mPermissionsTable selectRow:rowToSelect byExtendingSelection:NO];
+      [mPermissionsTable selectRowIndexes:[NSIndexSet indexSetWithIndex:rowToSelect]
+                                                   byExtendingSelection:NO];
       [mPermissionsTable scrollRowToVisible:rowToSelect];
     }
   }
@@ -508,7 +500,8 @@ const int kSortReverse = 1;
     int rowToSelect = [selectedIndexes lastIndex] - ([selectedIndexes count] - 1);
     if ((rowToSelect < 0) || (rowToSelect >= [mPermissionsTable numberOfRows]))
       rowToSelect = [mPermissionsTable numberOfRows] - 1;
-    [mPermissionsTable selectRow:rowToSelect byExtendingSelection:NO];
+    [mPermissionsTable selectRowIndexes:[NSIndexSet indexSetWithIndex:rowToSelect]
+                   byExtendingSelection:NO];
   }
 }
 
@@ -643,7 +636,8 @@ const int kSortReverse = 1;
     {
       rowToSelect = [mKeychainExclusionsTable numberOfRows] - 1;
     }
-    [mKeychainExclusionsTable selectRow:rowToSelect byExtendingSelection:NO];
+    [mKeychainExclusionsTable selectRowIndexes:[NSIndexSet indexSetWithIndex:rowToSelect]
+                          byExtendingSelection:NO];
   }
 }
 
@@ -741,7 +735,8 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
       [self sortByColumn:mPermissionColumn];
       int newRowIndex = [mPermissions indexOfObject:permission];
       if (newRowIndex != NSNotFound) {
-        [aTableView selectRow:newRowIndex byExtendingSelection:NO];
+        [aTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:newRowIndex]
+                byExtendingSelection:NO];
         [aTableView scrollRowToVisible:newRowIndex];
       }
     }
@@ -765,7 +760,7 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
   // Ensure a row is selected. Cocoa doesn't do this for us, but will keep
   // us from unselecting a row once one is set; go figure.
   if ([table numberOfRows] > 0)
-    [table selectRow:0 byExtendingSelection:NO];
+    [table selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO];
 }
 
 - (void)sortByColumn:(NSTableColumn*)tableColumn
@@ -899,7 +894,8 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
       // scroll to the first item (arbitrary, but at least one should show)
       if (i == 0)
         [aTableView scrollRowToVisible:newRowIndex];
-      [aTableView selectRow:newRowIndex byExtendingSelection:YES];
+      [aTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:newRowIndex]
+              byExtendingSelection:YES];
     }
   }
 }

mozilla/camino/PreferencePanes/Security/English.lproj/Security.nib/info.nib

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>69 14 356 240 0 0 1440 878 </string>
+	<string>65 37 356 240 0 0 1440 878 </string>
 	<key>IBFramework Version</key>
 	<string>489.0</string>
 	<key>IBLastKnownRelativeProjectPath</key>
@@ -11,7 +11,7 @@
 	<key>IBOldestOS</key>
 	<integer>5</integer>
 	<key>IBSystem Version</key>
-	<string>9J61</string>
+	<string>9L31a</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>

mozilla/camino/PreferencePanes/WebFeatures/WebFeatures.mm

@@ -244,8 +244,10 @@ const int kAnnoyancePrefSome = 3;
 
   // ensure a row is selected (cocoa doesn't do this for us, but will keep
   // us from unselecting a row once one is set; go figure).
-  if ([mWhitelistTable numberOfRows] > 0)
-    [mWhitelistTable selectRow:0 byExtendingSelection:NO];
+  if ([mWhitelistTable numberOfRows] > 0) {
+    [mWhitelistTable selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
+                 byExtendingSelection:NO];
+  }
 
   [mWhitelistTable setDeleteAction:@selector(removeWhitelistSite:)];
   [mWhitelistTable setTarget:self];
@@ -292,7 +294,8 @@ const int kAnnoyancePrefSome = 3;
     int rowToSelect = [selectedIndexes lastIndex] - ([selectedIndexes count] - 1);
     if ((rowToSelect < 0) || (rowToSelect >= [mWhitelistTable numberOfRows]))
       rowToSelect = [mWhitelistTable numberOfRows] - 1;
-    [mWhitelistTable selectRow:rowToSelect byExtendingSelection:NO];
+    [mWhitelistTable selectRowIndexes:[NSIndexSet indexSetWithIndex:rowToSelect]
+                 byExtendingSelection:NO];
   }
 }
 

mozilla/camino/config/Camino.xcconfig

@@ -14,8 +14,8 @@ GCC_ENABLE_PASCAL_STRINGS = YES
 GCC_PREPROCESSOR_DEFINITIONS = OSTYPE=Darwin1.4 OSARCH=Darwin MOZILLA_INTERNAL_API=1
 OTHER_LDFLAGS = -lpthread -lm -Wl,-executable_path,build/$(CONFIGURATION)/$(WRAPPER_NAME)/Contents/MacOS
 LIBRARY_SEARCH_PATHS = ../dist/bin ../dist/lib
-HEADER_SEARCH_PATHS = ../dist/include ../dist/include/appcomps ../dist/include/camino ../dist/include/caps ../dist/include/chardet ../dist/include/chrome ../dist/include/commandhandler ../dist/include/composer ../dist/include/content ../dist/include/cookie ../dist/include/docshell ../dist/include/dom ../dist/include/downloads ../dist/include/editor ../dist/include/embed_base ../dist/include/exthandler ../dist/include/find ../dist/include/gfx ../dist/include/helperAppDlg ../dist/include/history ../dist/include/htmlparser ../dist/include/intl ../dist/include/js ../dist/include/layout ../dist/include/locale ../dist/include/mimetype ../dist/include/mork ../dist/include/necko ../dist/include/nkcache ../dist/include/nspr ../dist/include/pipboot ../dist/include/pipnss ../dist/include/pref ../dist/include/profdirserviceprovider ../dist/include/shistory ../dist/include/spellchecker ../dist/include/string ../dist/include/thebes ../dist/include/txtsvc ../dist/include/uconv ../dist/include/unicharutil ../dist/include/uriloader ../dist/include/url-classifier ../dist/include/view ../dist/include/webbrowserpersist ../dist/include/webbrwsr ../dist/include/webshell ../dist/include/widget ../dist/include/windowwatcher ../dist/include/xmlextras ../dist/include/xpcom ../dist/include/xpconnect ../dist/include/xultmpl ../dist/public/nss $(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon
-FRAMEWORK_SEARCH_PATHS = sharedmenuscocoa/build/$(CONFIGURATION) sparkle/build/Release growl/build/$(CONFIGURATION) google-breakpad/src/client/mac/build/Release
+HEADER_SEARCH_PATHS = ../dist/include ../dist/include/appcomps ../dist/include/camino ../dist/include/caps ../dist/include/chardet ../dist/include/chrome ../dist/include/commandhandler ../dist/include/composer ../dist/include/content ../dist/include/cookie ../dist/include/docshell ../dist/include/dom ../dist/include/downloads ../dist/include/editor ../dist/include/embed_base ../dist/include/exthandler ../dist/include/find ../dist/include/gfx ../dist/include/helperAppDlg ../dist/include/history ../dist/include/htmlparser ../dist/include/intl ../dist/include/js ../dist/include/layout ../dist/include/locale ../dist/include/mimetype ../dist/include/necko ../dist/include/nkcache ../dist/include/nspr ../dist/include/pipboot ../dist/include/pipnss ../dist/include/places ../dist/include/pref ../dist/include/profdirserviceprovider ../dist/include/shistory ../dist/include/spellchecker ../dist/include/string ../dist/include/thebes ../dist/include/txtsvc ../dist/include/uconv ../dist/include/unicharutil ../dist/include/uriloader ../dist/include/url-classifier ../dist/include/view ../dist/include/webbrowserpersist ../dist/include/webbrwsr ../dist/include/webshell ../dist/include/widget ../dist/include/windowwatcher ../dist/include/xmlextras ../dist/include/xpcom ../dist/include/xpconnect ../dist/include/xultmpl ../dist/public/nss $(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon
+FRAMEWORK_SEARCH_PATHS = sparkle/build/Release growl/build/Release google-breakpad/src/client/mac/build/Release
 
 // Warning settings
 GCC_TREAT_WARNINGS_AS_ERRORS = YES

mozilla/camino/config/app-license.html

@@ -1,4 +1,4 @@
-    <p><b>Binaries</b> of this product released by the 
-    <a href="http://www.mozilla.org/">Mozilla Foundation</a>
-    are made available under the corresponding
-    <a href="http://www.mozilla.org/legal/eula/">EULA</a>.</p>
+    <p><b>Binaries</b> of this product have been made available to you by the
+    <a href="http://www.mozilla.org/">Mozilla Project</a> under the Mozilla
+    Public License. <a href="http://caminobrowser.org/legal/rights/">Know your 
+    rights</a>.</p>

mozilla/camino/config/year.txt

@@ -1 +1 @@
-2009
+2010

mozilla/camino/confvars.sh

@@ -50,3 +50,4 @@ MOZ_WEBSERVICES=
 MOZ_NO_XPCOM_OBSOLETE=1
 MOZ_XPINSTALL=
 MOZ_URL_CLASSIFIER=1
+MOZ_PLACES=1

mozilla/camino/docs/Release Notes 1-6-10.rtf

@@ -0,0 +1,195 @@
+{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+\readonlydoc1{\fonttbl\f0\fnil\fcharset0 TrebuchetMS;\f1\fnil\fcharset0 LucidaGrande;\f2\fnil\fcharset0 Monaco;
+}
+{\colortbl;\red255\green255\blue255;\red51\green51\blue51;\red0\green0\blue255;}
+\margl1440\margr1440\vieww11860\viewh15480\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+
+\f0\b\fs30 \cf2 About Camino
+\fs24 \super \'ae
+\fs30 \nosupersub  1.6.10\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 Camino 1.6.10 is a security and stability update for Camino 1.6.x. All users are urged to upgrade.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Changes since Camino 1.6\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following changes and improvements have been made since the Camino 1.6 release.
+\f0\b\fs30 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\f1\fs20 \cf2 Camino 1.6.10 contains the following improvements over version 1.6.9:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Disabled Java on Mac OS X 10.6 \'93Snow Leopard\'94 to prevent crashes (users who need Java should see the Known Issues section for solutions).\
+	\'95	Fixed a possible crash when closing a tab by clicking on its close button.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.9 contains the following improvements over version 1.6.8:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.23 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Upgraded the \'93Block flash animations\'94 code to use Flashblock 1.5.11.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.8 contains the following improvements over version 1.6.7:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.22 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	The presence of invalid cookies no longer prevents display of the list of stored cookies.\
+	\'95	Typing to choose an item now works properly in 
+\f2 <select>
+\f1  controls with 
+\f2 <optgroup>
+\f1  elements.\
+	\'95	The Downloads window will no longer close when the Customize Toolbar sheet is visible.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.7 contains the following improvements over version 1.6.6:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.21 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	OpenSearch plug-ins containing ampersands will now work correctly on Mac OS X 10.3.9.\
+	\'95	Cookies without a valid name no longer prevent display of the list of stored cookies.\
+	\'95	Quitting Camino with the pop-up blocker visible should no longer cause a crash.\
+	\'95	Find will now work properly when viewing JavaScript files which use the new JavaScript MIME type definitions.\
+	\'95	The default browser pop-up menu will no longer show a blank default browser on clean Mac OS X 10.5 installations.\
+	\'95	Selecting an item from a context menu after its window has closed will no longer cause a crash.\
+	\'95	The icon for the Google feed handler has been updated to match the new Google site icon.\
+	\'95	Upgraded the \'93Block flash animations\'94 code to use Flashblock 1.5.8.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.6 contains the following improvements over version 1.6.5:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.19 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Upgraded the \'93Block flash animations\'94 code to use Flashblock 1.5.7.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.5 contains the following improvements over version 1.6.4:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.18 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Camino will no longer crash on startup when the Mac OS X spelling system is broken.\
+	\'95	The General preference pane will no longer be missing for users who had customized the Preferences window toolbar.\
+	\'95	The icon for the Google feed handler has been updated to match the new Google site icon.\
+	\'95	Added CamiTools to the list of problematic add-ons.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.4 contains the following improvements over version 1.6.3:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.17 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Camino again displays expiration dates for Certificate Authorities in the Certificates window.\
+	\'95	Camino no longer reads OmniWeb\'92s \'93password not saved\'94 markers in the Keychain as valid accounts.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.3 contains the following improvements over version 1.6.2:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.16 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.2 contains the following improvements over version 1.6.1:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.15 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Camino will no longer crash when displaying a popup while a bookmark is being dragged.\
+	\'95	Feed and OpenSearch notifications remain visible until dismissed.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.1 contains the following improvements over version 1.6:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Camino will no longer crash when attempting to add a search engine that uses 
+\f2 POST
+\f1 .\
+	\'95	Camino displays more useful error messages when it is unable to add a search engine.\
+	\'95	Camino supports a wider variety of search engine definition files.\
+	\'95	Restored compatibility with Adobe Dreamweaver and other applications that use a deprecated AppleEvent to open documents in Camino.\
+	\'95	Improved robustness of code used to access the Keychain.\
+	\'95	Command-period will now close the Find toolbar on Mac OS X 10.5.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Features in Camino 1.6\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sa200\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following are the major changes and improvements made since the Camino 1.5 release. A full list is available on our {\field{\*\fldinst{HYPERLINK "http://caminobrowser.org/releases/1.6/complete.php"}}{\fldrslt \cf3 \ul \ulc3 website}}.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Automatic software updates
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now checks for new releases automatically.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Improved tabbed browsing
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	When more tabs are open than can be displayed in the tab bar, arrows appear at the right and left edges to allow scrolling the bar. As part of this change, the tab overflow menu has been replaced by a menu displaying all open tabs in the current window.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Keychain compatibility
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino can now store information in the Keychain for multiple accounts at the same site.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Improved toolbar search
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	The search field in the toolbar now includes a simple editor that allows deleting, renaming, and reordering search engines.\
+	\'95	Camino now supports {\field{\*\fldinst{HYPERLINK "http://opensearch.org/"}}{\fldrslt \cf3 \ul \ulc3 OpenSearch}} search engine plug-ins. New search engines can be added to the toolbar\'92s search field by automatic discovery or by web pages that provide links to OpenSearch plug-ins.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Streamlined Find interface
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	The Find panel has been replaced by a Find toolbar that appears near the bottom of the browser window.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Enhanced AppleScript capabilities
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	AppleScripts can now refer to individual tabs and windows.\
+	\'95	It is now possible to add, open, and delete bookmarks via AppleScript.\
+	\'95	Camino now supports {\field{\*\fldinst{HYPERLINK "http://wiki.caminobrowser.org/Development:Camino_AppleScript_Guide"}}{\fldrslt \cf3 \ul \ulc3 custom toolbar items}} written in AppleScript.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Additional feed reader options
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino can now pass feeds to certain web-based feed readers.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b User interface polish
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino 1.6 includes a number of new toolbar icons and interface enhancements to fit more closely with the visual style of Mac OS X 10.5.
+\f0\b\fs30 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 \
+Known Issues\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 For information about other issues or problems, please visit our {\field{\*\fldinst{HYPERLINK "http://www.caminobrowser.org/help/"}}{\fldrslt \cf3 \ul \ulc3 Help page}}.\
+\
+\pard\tx360\tx720\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\sa200\ql\qnatural
+\cf2 	\'95	The version of the Java Embedding Plugin included in Camino 1.6.x is incompatible with Java on Mac OS X 10.6 \'93Snow Leopard,\'94 so Camino 1.6.10 and later disable Java by default on that version of Mac OS X. Users who need Java should manually upgrade the bundled Java Embedding Plugin using {\field{\*\fldinst{HYPERLINK "http://wiki.caminobrowser.org/QA:Camino_1.6.x%2C_Mac_OS_X_10.6%2C_and_Java"}}{\fldrslt these instructions}}.\
+	\'95	Version 2.2 of the Flip4Mac (F4M) plug-in for displaying Windows Media content causes major rendering issues in Camino. The Flip4Mac team has fixed this problem in version 2.2.1.7b+ of the plug-in.\
+	\'95	After visiting enough pages with Flash content while browsing, Camino may stop functioning correctly.  Quitting and re-launching Camino will resolve the problem.  This behavior is caused by a bug in the Flash plug-in and is fixed in version 10.0 of the plug-in, which is available for Mac OS X 10.4 and higher.\
+	\'95	Some versions of the third-party add-on 1Password are not compatible with Camino 1.6.x. These versions can cause Camino to crash on launch, hang when importing bookmarks, and hang when pasting into the location bar. Disabling 1Password\'92s integration with Camino will stop these problems; users should contact 1Password support for more information.}

mozilla/camino/docs/Release Notes 1-6-11.rtf

@@ -0,0 +1,208 @@
+{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+\readonlydoc1{\fonttbl\f0\fnil\fcharset0 TrebuchetMS;\f1\fnil\fcharset0 LucidaGrande;\f2\fnil\fcharset0 Monaco;
+}
+{\colortbl;\red255\green255\blue255;\red51\green51\blue51;\red0\green0\blue255;}
+\margl1440\margr1440\vieww11860\viewh15480\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+
+\f0\b\fs30 \cf2 About Camino
+\fs24 \super \'ae
+\fs30 \nosupersub  1.6.11\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 Camino 1.6.11 is a security and stability update for Camino 1.6.x users running Mac OS X 10.3.9. Camino 1.6.11 will be the last update in the 1.6.x series and is thus the last version of Camino to support Mac OS X 10.3.\
+\
+All users on Mac OS X 10.3.9 are urged to upgrade to this version; all users on Mac OS X 10.4 or higher should upgrade to Camino 2.0.x instead. \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Changes since Camino 1.6\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following changes and improvements have been made since the Camino 1.6 release.
+\f0\b\fs30 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\f1\fs20 \cf2 Camino 1.6.11 contains the following improvements over version 1.6.10:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.24 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	It is once again possible to trust new Certificate Authorities.\
+	\'95	Clicking on warning or error text in a certificate no longer causes the text to change colors.\
+	\'95	When adding cookie exceptions, Camino now adds the correct exception for \'93.sitename.tld\'94 cookies.\
+	\'95	The presence of non-ASCII data in cookie values no longer prevents display of the list of stored cookies.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.10 contains the following improvements over version 1.6.9:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Disabled Java on Mac OS X 10.6 \'93Snow Leopard\'94 to prevent crashes (users who need Java should see the Known Issues section for solutions).\
+	\'95	Fixed a possible crash when closing a tab by clicking on its close button.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.9 contains the following improvements over version 1.6.8:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.23 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Upgraded the \'93Block flash animations\'94 code to use Flashblock 1.5.11.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.8 contains the following improvements over version 1.6.7:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.22 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	The presence of invalid cookies no longer prevents display of the list of stored cookies.\
+	\'95	Typing to choose an item now works properly in 
+\f2 <select>
+\f1  controls with 
+\f2 <optgroup>
+\f1  elements.\
+	\'95	The Downloads window will no longer close when the Customize Toolbar sheet is visible.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.7 contains the following improvements over version 1.6.6:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.21 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	OpenSearch plug-ins containing ampersands will now work correctly on Mac OS X 10.3.9.\
+	\'95	Cookies without a valid name no longer prevent display of the list of stored cookies.\
+	\'95	Quitting Camino with the pop-up blocker visible should no longer cause a crash.\
+	\'95	Find will now work properly when viewing JavaScript files which use the new JavaScript MIME type definitions.\
+	\'95	The default browser pop-up menu will no longer show a blank default browser on clean Mac OS X 10.5 installations.\
+	\'95	Selecting an item from a context menu after its window has closed will no longer cause a crash.\
+	\'95	The icon for the Google feed handler has been updated to match the new Google site icon.\
+	\'95	Upgraded the \'93Block flash animations\'94 code to use Flashblock 1.5.8.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.6 contains the following improvements over version 1.6.5:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.19 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Upgraded the \'93Block flash animations\'94 code to use Flashblock 1.5.7.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.5 contains the following improvements over version 1.6.4:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.18 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Camino will no longer crash on startup when the Mac OS X spelling system is broken.\
+	\'95	The General preference pane will no longer be missing for users who had customized the Preferences window toolbar.\
+	\'95	The icon for the Google feed handler has been updated to match the new Google site icon.\
+	\'95	Added CamiTools to the list of problematic add-ons.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.4 contains the following improvements over version 1.6.3:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.17 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Camino again displays expiration dates for Certificate Authorities in the Certificates window.\
+	\'95	Camino no longer reads OmniWeb\'92s \'93password not saved\'94 markers in the Keychain as valid accounts.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.3 contains the following improvements over version 1.6.2:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.16 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.2 contains the following improvements over version 1.6.1:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.15 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Camino will no longer crash when displaying a popup while a bookmark is being dragged.\
+	\'95	Feed and OpenSearch notifications remain visible until dismissed.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.1 contains the following improvements over version 1.6:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Camino will no longer crash when attempting to add a search engine that uses 
+\f2 POST
+\f1 .\
+	\'95	Camino displays more useful error messages when it is unable to add a search engine.\
+	\'95	Camino supports a wider variety of search engine definition files.\
+	\'95	Restored compatibility with Adobe Dreamweaver and other applications that use a deprecated AppleEvent to open documents in Camino.\
+	\'95	Improved robustness of code used to access the Keychain.\
+	\'95	Command-period will now close the Find toolbar on Mac OS X 10.5.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Features in Camino 1.6\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sa200\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following are the major changes and improvements made since the Camino 1.5 release. A full list is available on our {\field{\*\fldinst{HYPERLINK "http://caminobrowser.org/releases/1.6/complete.php"}}{\fldrslt \cf3 \ul \ulc3 website}}.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Automatic software updates
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now checks for new releases automatically.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Improved tabbed browsing
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	When more tabs are open than can be displayed in the tab bar, arrows appear at the right and left edges to allow scrolling the bar. As part of this change, the tab overflow menu has been replaced by a menu displaying all open tabs in the current window.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Keychain compatibility
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino can now store information in the Keychain for multiple accounts at the same site.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Improved toolbar search
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	The search field in the toolbar now includes a simple editor that allows deleting, renaming, and reordering search engines.\
+	\'95	Camino now supports {\field{\*\fldinst{HYPERLINK "http://opensearch.org/"}}{\fldrslt \cf3 \ul \ulc3 OpenSearch}} search engine plug-ins. New search engines can be added to the toolbar\'92s search field by automatic discovery or by web pages that provide links to OpenSearch plug-ins.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Streamlined Find interface
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	The Find panel has been replaced by a Find toolbar that appears near the bottom of the browser window.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Enhanced AppleScript capabilities
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	AppleScripts can now refer to individual tabs and windows.\
+	\'95	It is now possible to add, open, and delete bookmarks via AppleScript.\
+	\'95	Camino now supports {\field{\*\fldinst{HYPERLINK "http://wiki.caminobrowser.org/Development:Camino_AppleScript_Guide"}}{\fldrslt \cf3 \ul \ulc3 custom toolbar items}} written in AppleScript.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Additional feed reader options
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino can now pass feeds to certain web-based feed readers.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b User interface polish
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino 1.6 includes a number of new toolbar icons and interface enhancements to fit more closely with the visual style of Mac OS X 10.5.
+\f0\b\fs30 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 \
+Known Issues\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 For information about other issues or problems, please visit our {\field{\*\fldinst{HYPERLINK "http://www.caminobrowser.org/help/"}}{\fldrslt \cf3 \ul \ulc3 Help page}}.\
+\
+\pard\tx360\tx720\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\sa200\ql\qnatural
+\cf2 	\'95	The version of the Java Embedding Plugin included in Camino 1.6.x is incompatible with Java on Mac OS X 10.6 \'93Snow Leopard,\'94 so Camino 1.6.10 and later disable Java by default on that version of Mac OS X. Users who need Java should manually upgrade the bundled Java Embedding Plugin using {\field{\*\fldinst{HYPERLINK "http://wiki.caminobrowser.org/QA:Camino_1.6.x%2C_Mac_OS_X_10.6%2C_and_Java"}}{\fldrslt these instructions}}.\
+	\'95	Version 2.2 of the Flip4Mac (F4M) plug-in for displaying Windows Media content causes major rendering issues in Camino. The Flip4Mac team has fixed this problem in version 2.2.1.7b+ of the plug-in.\
+	\'95	After visiting enough pages with Flash content while browsing, Camino may stop functioning correctly.  Quitting and re-launching Camino will resolve the problem.  This behavior is caused by a bug in the Flash plug-in and is fixed in version 10.0 of the plug-in, which is available for Mac OS X 10.4 and higher.\
+	\'95	Some versions of the third-party add-on 1Password are not compatible with Camino 1.6.x. These versions can cause Camino to crash on launch, hang when importing bookmarks, and hang when pasting into the location bar. Disabling 1Password\'92s integration with Camino will stop these problems; users should contact 1Password support for more information.}

mozilla/camino/docs/Release Notes 1-6-9.rtf

@@ -0,0 +1,186 @@
+{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf460
+\readonlydoc1{\fonttbl\f0\fnil\fcharset0 TrebuchetMS;\f1\fnil\fcharset0 LucidaGrande;\f2\fnil\fcharset0 Monaco;
+}
+{\colortbl;\red255\green255\blue255;\red51\green51\blue51;\red0\green0\blue255;}
+\margl1440\margr1440\vieww11860\viewh15480\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+
+\f0\b\fs30 \cf2 About Camino
+\fs24 \super \'ae
+\fs30 \nosupersub  1.6.9\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 Camino 1.6.9 is a security and stability update for Camino 1.6.x. All users are urged to upgrade.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Changes since Camino 1.6\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following changes and improvements have been made since the Camino 1.6 release.
+\f0\b\fs30 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\f1\fs20 \cf2 Camino 1.6.9 contains the following improvements over version 1.6.8:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.23 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Upgraded the \'93Block flash animations\'94 code to use Flashblock 1.5.11.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.8 contains the following improvements over version 1.6.7:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.22 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	The presence of invalid cookies no longer prevents display of the list of stored cookies.\
+	\'95	Typing to choose an item now works properly in 
+\f2 <select>
+\f1  controls with 
+\f2 <optgroup>
+\f1  elements.\
+	\'95	The Downloads window will no longer close when the Customize Toolbar sheet is visible.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.7 contains the following improvements over version 1.6.6:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.21 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	OpenSearch plug-ins containing ampersands will now work correctly on Mac OS X 10.3.9.\
+	\'95	Cookies without a valid name no longer prevent display of the list of stored cookies.\
+	\'95	Quitting Camino with the pop-up blocker visible should no longer cause a crash.\
+	\'95	Find will now work properly when viewing JavaScript files which use the new JavaScript MIME type definitions.\
+	\'95	The default browser pop-up menu will no longer show a blank default browser on clean Mac OS X 10.5 installations.\
+	\'95	Selecting an item from a context menu after its window has closed will no longer cause a crash.\
+	\'95	The icon for the Google feed handler has been updated to match the new Google site icon.\
+	\'95	Upgraded the \'93Block flash animations\'94 code to use Flashblock 1.5.8.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.6 contains the following improvements over version 1.6.5:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.19 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Upgraded the \'93Block flash animations\'94 code to use Flashblock 1.5.7.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.5 contains the following improvements over version 1.6.4:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.18 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Camino will no longer crash on startup when the Mac OS X spelling system is broken.\
+	\'95	The General preference pane will no longer be missing for users who had customized the Preferences window toolbar.\
+	\'95	The icon for the Google feed handler has been updated to match the new Google site icon.\
+	\'95	Added CamiTools to the list of problematic add-ons.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.4 contains the following improvements over version 1.6.3:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.17 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Camino again displays expiration dates for Certificate Authorities in the Certificates window.\
+	\'95	Camino no longer reads OmniWeb\'92s \'93password not saved\'94 markers in the Keychain as valid accounts.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.3 contains the following improvements over version 1.6.2:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.16 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.2 contains the following improvements over version 1.6.1:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.8.1.15 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Camino will no longer crash when displaying a popup while a bookmark is being dragged.\
+	\'95	Feed and OpenSearch notifications remain visible until dismissed.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 1.6.1 contains the following improvements over version 1.6:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Camino will no longer crash when attempting to add a search engine that uses 
+\f2 POST
+\f1 .\
+	\'95	Camino displays more useful error messages when it is unable to add a search engine.\
+	\'95	Camino supports a wider variety of search engine definition files.\
+	\'95	Restored compatibility with Adobe Dreamweaver and other applications that use a deprecated AppleEvent to open documents in Camino.\
+	\'95	Improved robustness of code used to access the Keychain.\
+	\'95	Command-period will now close the Find toolbar on Mac OS X 10.5.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Features in Camino 1.6\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sa200\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following are the major changes and improvements made since the Camino 1.5 release. A full list is available on our {\field{\*\fldinst{HYPERLINK "http://caminobrowser.org/releases/1.6/complete.php"}}{\fldrslt \cf3 \ul \ulc3 website}}.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Automatic software updates
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now checks for new releases automatically.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Improved tabbed browsing
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	When more tabs are open than can be displayed in the tab bar, arrows appear at the right and left edges to allow scrolling the bar. As part of this change, the tab overflow menu has been replaced by a menu displaying all open tabs in the current window.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Keychain compatibility
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino can now store information in the Keychain for multiple accounts at the same site.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Improved toolbar search
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	The search field in the toolbar now includes a simple editor that allows deleting, renaming, and reordering search engines.\
+	\'95	Camino now supports {\field{\*\fldinst{HYPERLINK "http://opensearch.org/"}}{\fldrslt \cf3 \ul \ulc3 OpenSearch}} search engine plug-ins. New search engines can be added to the toolbar\'92s search field by automatic discovery or by web pages that provide links to OpenSearch plug-ins.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Streamlined Find interface
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	The Find panel has been replaced by a Find toolbar that appears near the bottom of the browser window.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Enhanced AppleScript capabilities
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	AppleScripts can now refer to individual tabs and windows.\
+	\'95	It is now possible to add, open, and delete bookmarks via AppleScript.\
+	\'95	Camino now supports {\field{\*\fldinst{HYPERLINK "http://wiki.caminobrowser.org/Development:Camino_AppleScript_Guide"}}{\fldrslt \cf3 \ul \ulc3 custom toolbar items}} written in AppleScript.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Additional feed reader options
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino can now pass feeds to certain web-based feed readers.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b User interface polish
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino 1.6 includes a number of new toolbar icons and interface enhancements to fit more closely with the visual style of Mac OS X 10.5.
+\f0\b\fs30 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 \
+Known Issues\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 For information about other issues or problems, please visit our {\field{\*\fldinst{HYPERLINK "http://www.caminobrowser.org/help/"}}{\fldrslt \cf3 \ul \ulc3 Help page}}.\
+\
+\pard\tx360\tx720\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\sa200\ql\qnatural
+\cf2 	\'95	Version 2.2 of the Flip4Mac (F4M) plug-in for displaying Windows Media content causes major rendering issues in Camino. The Flip4Mac team has fixed this problem in version 2.2.1.7b+ of the plug-in.\
+	\'95	After visiting enough pages with Flash content while browsing, Camino may stop functioning correctly.  Quitting and re-launching Camino will resolve the problem.  This behavior is caused by a bug in the Flash plug-in and is fixed in version 10.0 of the plug-in, which is available for Mac OS X 10.4 and higher.\
+	\'95	Some versions of the third-party add-on 1Password are not compatible with Camino 1.6.x. These versions can cause Camino to crash on launch, hang when importing bookmarks, and hang when pasting into the location bar. Disabling 1Password\'92s integration with Camino will stop these problems; users should contact 1Password support for more information.}

mozilla/camino/docs/Release Notes 2-0-1.rtf

@@ -0,0 +1,113 @@
+{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+\readonlydoc1{\fonttbl\f0\fnil\fcharset0 TrebuchetMS;\f1\fnil\fcharset0 LucidaGrande;}
+{\colortbl;\red255\green255\blue255;\red51\green51\blue51;\red0\green0\blue255;}
+\margl1440\margr1440\vieww12100\viewh16140\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+
+\f0\b\fs30 \cf2 About Camino
+\fs24 \super \'ae
+\fs30 \nosupersub  2.0.1\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sa200\ql\qnatural
+
+\f1\b0\fs20 \cf2 Camino 2.0.1 is a security and stability update for Camino 2.0. All users are urged to upgrade.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+
+\f0\b\fs30 \cf2 Changes since Camino 2.0\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following changes and improvements have been made since the Camino 2.0 release.
+\f0\b\fs30 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\f1\fs20 \cf2 Camino 2.0.1 contains the following improvements over version 2.0:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.9.0.16 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	The Help menu will once again contain the search field in non-English localizations on Mac OS X 10.6.\
+	\'95	The Camino Crash Reporter will now offer to send your email address with your crash report to allow the Camino developers to contact you for more information about your crash.\
+	\'95	Clicking on warning or error text in a certificate no longer causes the text to change colors.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Features in Camino 2\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sa200\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following are the major changes and improvements made since the Camino 1.6 release. A full list is available on our {\field{\*\fldinst{HYPERLINK "http://caminobrowser.org/releases/2.0/complete.php"}}{\fldrslt \cf3 \ul \ulc3 website}}.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Improved tabbed browsing
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	The Tab Overview feature displays a grid of thumbnails of the tabs in the current window.\
+	\'95	Tabs can be rearranged by dragging and dropping.\
+ 	\'95	Command-click now defaults to opening links in new tabs instead of new windows.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b New security features
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now supports the {\field{\*\fldinst{HYPERLINK "http://code.google.com/apis/safebrowsing/"}}{\fldrslt Google Safe Browsing}} service to provide warnings about many potentially malicious websites.\
+	\'95	Camino now displays error pages for secure web pages using invalid or untrusted certificates.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Full content zoom
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now has support for making the entire contents of a web page bigger or smaller.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Download notifications
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	If {\field{\*\fldinst{HYPERLINK "http://growl.info/"}}{\fldrslt Growl}} is installed, Camino will generate notifications when downloads begin and finish.\
+	\'95	On Mac OS X 10.5 and higher, Camino will bounce the downloads folder in the Dock when a download finishes.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Recently closed pages
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	The History menu now contains a sub-menu listing the last 20 closed web pages.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Improved support for Full Keyboard Access
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	When Full Keyboard Access is enabled, tabbing now moves correctly through the entire browser window.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Enhanced annoyance blocking
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now includes an exceptions list to allow disabling \'93Block Flash animations\'94 on a per-site basis and an \'93Allow Flash From This Site\'94 contextual menu item to ease adding sites to the exceptions list.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b New AppleScript capabilities
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	AppleScripts can now obtain the HTML source or text of an entire web page or of a selection.\
+	\'95	Added AppleScript support for setting the active tab in each browser window.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Web content support
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now uses version 1.9.0 of Mozilla\'92s Gecko rendering engine, which contains thousands of bug fixes, better web plug-in compatibility and performance, enhanced support for web standards, and new technologies like JavaScript 1.8.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Known Issues\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 For information about other issues or problems, please visit our {\field{\*\fldinst{HYPERLINK "http://www.caminobrowser.org/help/"}}{\fldrslt \cf3 \ul \ulc3 Help page}}.\
+\
+\pard\tx360\tx720\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\sa200\ql\qnatural
+\cf2 	\'95	If \'93Ask me before accepting each cookie\'94 is checked, Camino will display a cookie dialog for each cookie request from a web page.\
+	\'95	Scroll bars will appear active even when the window is not active.\
+	\'95	Incompatible third-party plug-ins:\
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\sa200\ql\qnatural
+\cf2 	\'95	Shockwave Player 10 and older will not display Shockwave content in Camino 2; to display Shockwave content, install Shockwave Player 11 or newer.\
+	\'95	Versions of the Flip4Mac (F4M) plug-in older than version 2.2.1.11 contained a bug that caused major rendering issues in Camino. To display Windows Media content without experiencing this bug, upgrade to Flip4Mac version 2.3.0.14 or later.\
+	\'95	Older versions of the Adobe Flash plug-in had a bug that could cause Camino to stop functioning correctly after visiting enough pages with Flash content while browsing. This is fixed in version 10.0 of the Flash plug-in.}

mozilla/camino/docs/Release Notes 2-0-2.rtf

@@ -0,0 +1,124 @@
+{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+\readonlydoc1{\fonttbl\f0\fnil\fcharset0 TrebuchetMS;\f1\fnil\fcharset0 LucidaGrande;}
+{\colortbl;\red255\green255\blue255;\red51\green51\blue51;\red0\green0\blue255;}
+\margl1440\margr1440\vieww12100\viewh16140\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+
+\f0\b\fs30 \cf2 About Camino
+\fs24 \super \'ae
+\fs30 \nosupersub  2.0.2\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sa200\ql\qnatural
+
+\f1\b0\fs20 \cf2 Camino 2.0.2 is a security and stability update for Camino 2.0.x. All users are urged to upgrade.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+
+\f0\b\fs30 \cf2 Changes since Camino 2.0\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following changes and improvements have been made since the Camino 2.0 release.
+\f0\b\fs30 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\f1\fs20 \cf2 Camino 2.0.2 contains the following improvements over version 2.0.1:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.9.0.18 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Command-Arrow key combinations can again be reassigned as shortcuts for other menu items.\
+	\'95	Google\'92s Safe Browsing information pages will now appear in Norwegian for users of the Norwegian localization.\
+	\'95	The Bookmark Bar colors will again appear correctly on displays with a gamma other than 1.8.\
+	\'95	Upgraded the \'93Block flash animations\'94 code to use Flashblock 1.5.12.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 2.0.1 contains the following improvements over version 2.0:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.9.0.16 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	The Help menu will once again contain the search field in non-English localizations on Mac OS X 10.6.\
+	\'95	The Camino Crash Reporter will now offer to send your email address with your crash report to allow the Camino developers to contact you for more information about your crash.\
+	\'95	Clicking on warning or error text in a certificate no longer causes the text to change colors.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Features in Camino 2\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sa200\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following are the major changes and improvements made since the Camino 1.6 release. A full list is available on our {\field{\*\fldinst{HYPERLINK "http://caminobrowser.org/releases/2.0/complete.php"}}{\fldrslt \cf3 \ul \ulc3 website}}.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Improved tabbed browsing
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	The Tab Overview feature displays a grid of thumbnails of the tabs in the current window.\
+	\'95	Tabs can be rearranged by dragging and dropping.\
+ 	\'95	Command-click now defaults to opening links in new tabs instead of new windows.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b New security features
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now supports the {\field{\*\fldinst{HYPERLINK "http://code.google.com/apis/safebrowsing/"}}{\fldrslt Google Safe Browsing}} service to provide warnings about many potentially malicious websites.\
+	\'95	Camino now displays error pages for secure web pages using invalid or untrusted certificates.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Full content zoom
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now has support for making the entire contents of a web page bigger or smaller.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Download notifications
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	If {\field{\*\fldinst{HYPERLINK "http://growl.info/"}}{\fldrslt Growl}} is installed, Camino will generate notifications when downloads begin and finish.\
+	\'95	On Mac OS X 10.5 and higher, Camino will bounce the downloads folder in the Dock when a download finishes.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Recently closed pages
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	The History menu now contains a sub-menu listing the last 20 closed web pages.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Improved support for Full Keyboard Access
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	When Full Keyboard Access is enabled, tabbing now moves correctly through the entire browser window.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Enhanced annoyance blocking
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now includes an exceptions list to allow disabling \'93Block Flash animations\'94 on a per-site basis and an \'93Allow Flash From This Site\'94 contextual menu item to ease adding sites to the exceptions list.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b New AppleScript capabilities
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	AppleScripts can now obtain the HTML source or text of an entire web page or of a selection.\
+	\'95	Added AppleScript support for setting the active tab in each browser window.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Web content support
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now uses version 1.9.0 of Mozilla\'92s Gecko rendering engine, which contains thousands of bug fixes, better web plug-in compatibility and performance, enhanced support for web standards, and new technologies like JavaScript 1.8.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Known Issues\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 For information about other issues or problems, please visit our {\field{\*\fldinst{HYPERLINK "http://www.caminobrowser.org/help/"}}{\fldrslt \cf3 \ul \ulc3 Help page}}.\
+\
+\pard\tx360\tx720\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\sa200\ql\qnatural
+\cf2 	\'95	If \'93Ask me before accepting each cookie\'94 is checked, Camino will display a cookie dialog for each cookie request from a web page.\
+	\'95	Scroll bars will appear active even when the window is not active.\
+	\'95	Incompatible third-party plug-ins:\
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\sa200\ql\qnatural
+\cf2 	\'95	Shockwave Player 10 and older will not display Shockwave content in Camino 2; to display Shockwave content, install Shockwave Player 11 or newer.\
+	\'95	Versions of the Flip4Mac (F4M) plug-in older than version 2.2.1.11 contained a bug that caused major rendering issues in Camino. To display Windows Media content without experiencing this bug, upgrade to Flip4Mac version 2.2.3.7 or later.\
+	\'95	Older versions of the Adobe Flash plug-in had a bug that could cause Camino to stop functioning correctly after visiting enough pages with Flash content while browsing. This is fixed in version 10.0 of the Flash plug-in.}

mozilla/camino/docs/Release Notes 2-0-3.rtf

@@ -0,0 +1,142 @@
+{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+\readonlydoc1{\fonttbl\f0\fnil\fcharset0 TrebuchetMS;\f1\fnil\fcharset0 LucidaGrande;\f2\fnil\fcharset0 Monaco;
+}
+{\colortbl;\red255\green255\blue255;\red51\green51\blue51;\red0\green0\blue255;}
+\margl1440\margr1440\vieww12100\viewh16140\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+
+\f0\b\fs30 \cf2 About Camino
+\fs24 \super \'ae
+\fs30 \nosupersub  2.0.3\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sa200\ql\qnatural
+
+\f1\b0\fs20 \cf2 Camino 2.0.3 is a security and stability update for Camino 2.0.x. All users are urged to upgrade.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+
+\f0\b\fs30 \cf2 Changes since Camino 2.0\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following changes and improvements have been made since the Camino 2.0 release.
+\f0\b\fs30 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\f1\fs20 \cf2 Camino 2.0.3 contains the following improvements over version 2.0.2:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.9.0.19 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Prevented possible crashes when closing several tabs in succession.\
+	\'95	Bookmarks found in Spotlight searches will once again open in Camino.\
+	\'95	Bookmark import will no longer try to import old Firefox 
+\f2 bookmarks.html
+\f1  files from profiles used by Firefox 3 and later.\
+	\'95	Camino no longer exports Spotlight metadata for menu spacers.\
+	\'95	\'93Reset Camino\'94 will now always clear the \'93Recently Closed Pages\'94 menu.\
+	\'95	The context menu in about:config is now functional.\
+	\'95	Insecure cookies will no longer be shown as secure in the list of cookies.\
+	\'95	Prevented possible crashes when software update fails to download information about available updates.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 2.0.2 contains the following improvements over version 2.0.1:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.9.0.18 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	Command-Arrow key combinations can again be reassigned as shortcuts for other menu items.\
+	\'95	Google\'92s Safe Browsing information pages will now appear in Norwegian for users of the Norwegian localization.\
+	\'95	The Bookmark Bar colors will again appear correctly on displays with a gamma other than 1.8.\
+	\'95	Upgraded the \'93Block flash animations\'94 code to use Flashblock 1.5.12.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Camino 2.0.1 contains the following improvements over version 2.0:\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Upgraded to version 1.9.0.16 of the Mozilla Gecko rendering engine, which includes several critical security and stability fixes.\
+	\'95	The Help menu will once again contain the search field in non-English localizations on Mac OS X 10.6.\
+	\'95	The Camino Crash Reporter will now offer to send your email address with your crash report to allow the Camino developers to contact you for more information about your crash.\
+	\'95	Clicking on warning or error text in a certificate no longer causes the text to change colors.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Features in Camino 2\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sa200\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following are the major changes and improvements made since the Camino 1.6 release. A full list is available on our {\field{\*\fldinst{HYPERLINK "http://caminobrowser.org/releases/2.0/complete.php"}}{\fldrslt \cf3 \ul \ulc3 website}}.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Improved tabbed browsing
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	The Tab Overview feature displays a grid of thumbnails of the tabs in the current window.\
+	\'95	Tabs can be rearranged by dragging and dropping.\
+ 	\'95	Command-click now defaults to opening links in new tabs instead of new windows.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b New security features
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now supports the {\field{\*\fldinst{HYPERLINK "http://code.google.com/apis/safebrowsing/"}}{\fldrslt Google Safe Browsing}} service to provide warnings about many potentially malicious websites.\
+	\'95	Camino now displays error pages for secure web pages using invalid or untrusted certificates.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Full content zoom
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now has support for making the entire contents of a web page bigger or smaller.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Download notifications
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	If {\field{\*\fldinst{HYPERLINK "http://growl.info/"}}{\fldrslt Growl}} is installed, Camino will generate notifications when downloads begin and finish.\
+	\'95	On Mac OS X 10.5 and higher, Camino will bounce the downloads folder in the Dock when a download finishes.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Recently closed pages
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	The History menu now contains a sub-menu listing the last 20 closed web pages.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Improved support for Full Keyboard Access
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	When Full Keyboard Access is enabled, tabbing now moves correctly through the entire browser window.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Enhanced annoyance blocking
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now includes an exceptions list to allow disabling \'93Block Flash animations\'94 on a per-site basis and an \'93Allow Flash From This Site\'94 contextual menu item to ease adding sites to the exceptions list.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b New AppleScript capabilities
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	AppleScripts can now obtain the HTML source or text of an entire web page or of a selection.\
+	\'95	Added AppleScript support for setting the active tab in each browser window.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Web content support
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now uses version 1.9.0 of Mozilla\'92s Gecko rendering engine, which contains thousands of bug fixes, better web plug-in compatibility and performance, enhanced support for web standards, and new technologies like JavaScript 1.8.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Known Issues\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 For information about other issues or problems, please visit our {\field{\*\fldinst{HYPERLINK "http://www.caminobrowser.org/help/"}}{\fldrslt \cf3 \ul \ulc3 Help page}}.\
+\
+\pard\tx360\tx720\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\sa200\ql\qnatural
+\cf2 	\'95	If \'93Ask me before accepting each cookie\'94 is checked, Camino will display a cookie dialog for each cookie request from a web page.\
+	\'95	Scroll bars will appear active even when the window is not active.\
+	\'95	Incompatible third-party plug-ins:\
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\sa200\ql\qnatural
+\cf2 	\'95	Shockwave Player 10 and older will not display Shockwave content in Camino 2; to display Shockwave content, install Shockwave Player 11 or newer.\
+	\'95	Versions of the Flip4Mac (F4M) plug-in older than version 2.2.1.11 contained a bug that caused major rendering issues in Camino. To display Windows Media content without experiencing this bug, upgrade to Flip4Mac version 2.2.3.7 or later.\
+	\'95	Older versions of the Adobe Flash plug-in had a bug that could cause Camino to stop functioning correctly after visiting enough pages with Flash content while browsing. This is fixed in version 10.0 of the Flash plug-in.}

mozilla/camino/docs/Release Notes 2-0.rtf

@@ -0,0 +1,99 @@
+{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+\readonlydoc1{\fonttbl\f0\fnil\fcharset0 TrebuchetMS;\f1\fnil\fcharset0 LucidaGrande;}
+{\colortbl;\red255\green255\blue255;\red51\green51\blue51;\red0\green0\blue255;}
+\margl1440\margr1440\vieww12180\viewh17040\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+
+\f0\b\fs30 \cf2 About Camino
+\fs24 \super \'ae
+\fs30 \nosupersub  2\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sa200\ql\qnatural
+
+\f1\b0\fs20 \cf2 After over a year of hard work by devoted volunteers, the Camino Project is proud to give you Camino 2.0. This latest version includes many bug fixes and new features, providing all users with an improved browsing experience. This release displays web pages with Gecko 1.9, the same rendering engine used by the popular Firefox 3 web browser, and thus shares many of the security fixes and Gecko improvements that are in that version of Firefox.\
+The features listed below are just some of the many changes in Camino 2.0.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\cf2 Camino 2.0 is available for Mac OS X 10.4 and later. We advise users running Mac OS X 10.3.9 to download {\field{\*\fldinst{HYPERLINK "http://www.caminobrowser.org/download/releases/1.6.10/"}}{\fldrslt Camino 1.6.10}} ({\field{\*\fldinst{HYPERLINK "http://www.caminobrowser.org/releases/1.6.10/"}}{\fldrslt release notes}})\cf0 .\cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Features in Camino 2\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sa200\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following are the major changes and improvements made since the Camino 1.6 release. A full list is available on our {\field{\*\fldinst{HYPERLINK "http://caminobrowser.org/releases/2.0/complete.php"}}{\fldrslt \cf3 \ul \ulc3 website}}.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Improved tabbed browsing
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	The Tab Overview feature displays a grid of thumbnails of the tabs in the current window.\
+	\'95	Tabs can be rearranged by dragging and dropping.\
+ 	\'95	Command-click now defaults to opening links in new tabs instead of new windows.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b New security features
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now supports the {\field{\*\fldinst{HYPERLINK "http://code.google.com/apis/safebrowsing/"}}{\fldrslt Google Safe Browsing}} service to provide warnings about many potentially malicious websites.\
+	\'95	Camino now displays error pages for secure web pages using invalid or untrusted certificates.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Full content zoom
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now has support for making the entire contents of a web page bigger or smaller.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Download notifications
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	If {\field{\*\fldinst{HYPERLINK "http://growl.info/"}}{\fldrslt Growl}} is installed, Camino will generate notifications when downloads begin and finish.\
+	\'95	On Mac OS X 10.5 and higher, Camino will bounce the downloads folder in the Dock when a download finishes.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Recently closed pages
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	The History menu now contains a sub-menu listing the last 20 closed web pages.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Improved support for Full Keyboard Access
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	When Full Keyboard Access is enabled, tabbing now moves correctly through the entire browser window.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Enhanced annoyance blocking
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now includes an exceptions list to allow disabling \'93Block Flash animations\'94 on a per-site basis and an \'93Allow Flash From This Site\'94 contextual menu item to ease adding sites to the exceptions list.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b New AppleScript capabilities
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	AppleScripts can now obtain the HTML source or text of an entire web page or of a selection.\
+	\'95	Added AppleScript support for setting the active tab in each browser window.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	
+\b Web content support
+\b0 \
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Camino now uses version 1.9.0 of Mozilla\'92s Gecko rendering engine, which contains thousands of bug fixes, better web plug-in compatibility and performance, enhanced support for web standards, and new technologies like JavaScript 1.8.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Known Issues\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 For information about other issues or problems, please visit our {\field{\*\fldinst{HYPERLINK "http://www.caminobrowser.org/help/"}}{\fldrslt \cf3 \ul \ulc3 Help page}}.\
+\
+\pard\tx360\tx720\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\sa200\ql\qnatural
+\cf2 	\'95	If \'93Ask me before accepting each cookie\'94 is checked, Camino will display a cookie dialog for each cookie request from a web page.\
+	\'95	Scroll bars will appear active even when the window is not active.\
+	\'95	Incompatible third-party plug-ins:\
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\sa200\ql\qnatural
+\cf2 	\'95	Shockwave Player 10 and older will not display Shockwave content in Camino 2; to display Shockwave content, install Shockwave Player 11 or newer.\
+	\'95	Versions of the Flip4Mac (F4M) plug-in older than version 2.2.1.11 contained a bug that caused major rendering issues in Camino. To display Windows Media content without experiencing this bug, upgrade to Flip4Mac version 2.3.0.14 or later.\
+	\'95	Older versions of the Adobe Flash plug-in had a bug that could cause Camino to stop functioning correctly after visiting enough pages with Flash content while browsing. This is fixed in version 10.0 of the Flash plug-in.}

mozilla/camino/docs/Release Notes 2-0b4.rtf

@@ -0,0 +1,355 @@
+{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+\readonlydoc1{\fonttbl\f0\fnil\fcharset0 TrebuchetMS;\f1\fnil\fcharset0 LucidaGrande;\f2\fnil\fcharset0 Monaco;
+}
+{\colortbl;\red255\green255\blue255;\red51\green51\blue51;}
+\margl1440\margr1440\vieww12000\viewh15840\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+
+\f0\b\fs30 \cf2 About Camino
+\fs24 \super \'ae
+\fs30 \nosupersub  2.0 Beta 4\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 Camino 2.0 Beta 4 is the fifth preview release of a significant upgrade to the popular Mac OS X browser using Mozilla.org\'92s Gecko HTML rendering engine. Notable improvements include phishing and malware protection, enhanced AppleScript capabilities, a new crash reporting system that works on all Macs, Growl notifications for completed downloads, rearranging tabs by drag and drop, the ability to disable \'93Block Flash animations\'94 on a per-site basis, tab overview, full content zoom, better support for Full Keyboard Access in the browser window, and a \'93Recently Closed Pages\'94 menu.\
+\
+Note that Camino 2.0 Beta 4 is in the \'93beta\'94 stage, which means that it is close to its final shipping state. We feel that it is usable on a day-to-day basis and a large improvement over Camino 1.6, but you may still experience issues and some functionality may not work entirely as intended. The goal of this early release is to demonstrate the team\'92s progress and to allow users to report problems before the final release.\
+\
+Camino 2.0 Beta 4 shares the same code base as Firefox 3.0, both being based on version 1.9.0 of Gecko, and thus shares many of the security fixes and Gecko improvements that are in that version of Firefox.\
+\
+Camino 2.0 Beta 4 is available for Mac OS X 10.4 and later.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Features in Camino 2.0 Beta 4\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following changes and improvements have been made since the Camino 2.0 Beta 3 release.
+\f0\b\fs30 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\f1\fs20 \cf2 General\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Camino now supports the multi-touch \'93pinch\'94 gesture for zooming a webpage.\
+	\'95	The \'93visit count\'94 property of bookmarks and the \'93id\'94 property of windows are again functional in AppleScripts.\
+	\'95	Copying the location of a bookmark, link, or image and pasting into Pages documents or rich-text Mail messages now succeeds.\
+	\'95	When restarting for an automatic update, Camino will now save and restore pages that were open before quitting regardless of whether the \'93Load the pages that were open before quitting\'94 preference is enabled.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Preferences\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Streamlined the appearance of the Fonts tab of the Appearance preference pane.\
+	\'95	When choosing fonts in the Appearance preference pane, Camino will more accurately display the selected fonts, especially for East Asian languages.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Privacy & Security\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Camino now supports the {\field{\*\fldinst{HYPERLINK "http://code.google.com/apis/safebrowsing/"}}{\fldrslt Google Safe Browsing}} service to provide warnings about potentially malicious websites.\
+	\'95	Users can report unblocked potentially malicious websites using the \'93Report Phishing Page\'85\'94 item in the \'93Help\'94 menu.\
+	\'95	Improved the appearance of certificate and network error pages.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Tabs\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Camino will now properly display a warning when closing all windows if one window contains multiple tabs.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 User Interface\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Added a menu item to toggle the zoom keyboard shortcuts between full-content zoom and larger or smaller text.\
+	\'95	Camino now uses 10.5-style folder icons on Mac OS X 10.5 and newer.\
+	\'95	The Bookmark Bar and tab bar now better match the overall appearance of Mac OS X 10.5 and newer.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Web Page Interaction\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Reduced the scale factor used by the full-content zoom.\
+ 	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\f0\b\fs30 \cf2 Features in Camino 2.0 Beta 3\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following changes and improvements have been made since the Camino 2.0 Beta 2 release.
+\f0\b\fs30 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\f1\fs20 \cf2 General\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Added support for retrieving the text or source of the current page or current selection via AppleScript.\
+	\'95	Camino includes a new crash reporting system based on {\field{\*\fldinst{HYPERLINK "http://code.google.com/p/google-breakpad/"}}{\fldrslt Google Breakpad}} which works on both PowerPC and Intel Macintoshes.\
+	\'95	Minimized Camino windows now interact better with Spaces on Mac OS X 10.5.\
+	\'95	Quitting Camino with the pop-up blocker visible should no longer cause a crash.\
+	\'95	Selecting an item from a context menu after its window has closed will no longer cause a crash.\
+	\'95	Find will now work properly when viewing JavaScript files which use the new JavaScript MIME type definitions.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Bookmarks & History\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	The Bookmark Bar once again has the correct background appearance on Mac OS X 10.4.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Downloading\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	When the Downloads window is opened for the first time after launch, Camino now scrolls to the last selected download in the list, or to the end of the list if there is no selection.\
+	\'95	Added Command-Down Arrow as a keyboard shortcut for opening selected files in the Downloads window.\
+	\'95	Command-A will now select all downloads in the Downloads window.\
+	\'95	Camino no longer refreshes download information on inactive downloads.\
+	\'95	The Downloads window will no longer close when the Customize Toolbar sheet is visible.\
+	\'95	It is now possible to suppress display of the Downloads window with a hidden preference (this may be useful for {\field{\*\fldinst{HYPERLINK "http://www.growl.info/"}}{\fldrslt Growl}} users).\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Localization\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	The \'93Files\'94 portion of the HTML Complete folder name is now localizable.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Preferences\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	The presence of invalid cookies no longer prevents display of the list of stored cookies.\
+	\'95	The default browser pop-up menu will no longer show a blank default browser on clean Mac OS X 10.5 installations.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Privacy & Security\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	It is now possible to see and remove exceptions that have been added to allow access to secure web pages whose certificates are invalid or untrusted.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Tabs\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Improved the performance of tab dragging.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Web Page Interaction\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Web pages will no longer steal keyboard shortcuts from menu commands.\
+	\'95	Typing to choose an item now works properly in 
+\f2 <select>
+\f1  controls with 
+\f2 <optgroup>
+\f1  elements.\
+	\'95	Added \'93Allow Flash From This Site\'94 to the context menu for blocked Flash animations.\
+	\'95	Upgraded the \'93Block flash animations\'94 code to use Flashblock 1.5.10.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\f0\b\fs30 \cf2 Features in Camino 2.0 Beta 2\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following changes and improvements have been made since the Camino 2.0 Beta 1 release.
+\f0\b\fs30 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\f1\fs20 \cf2 Bookmarks & History\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Bookmark folders expanded during bookmark dragging now auto-collapse after dropping the bookmark.\
+	\'95	It is once again possible to move bookmarks that were imported from HTML-based bookmark files.\
+	\'95	Site icons in the bookmarks and history menus now display properly even when modifier keys are pressed.\
+	\'95	When the Top Ten List collection is used as the Dock menu, \'93Use as Dock menu\'94 will be checked in the context menu.\
+	\'95	Added support for importing bookmarks from SeaMonkey 2.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Downloading\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	If {\field{\*\fldinst{HYPERLINK "http://www.growl.info/"}}{\fldrslt Growl}} is installed, Camino will generate notifications when downloads begin and finish.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Tabs\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	On Mac OS X 10.4, background tabs will now draw properly while dragging.\
+	\'95	Attempting to drag the empty space in the tab bar will no longer drag the current tab.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 User Interface\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Non-ASCII characters in URLs are now displayed in a readable format in tooltips.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Web Page Interaction\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Pop-up menu 
+\f2 <select>
+\f1  controls will always display using the Aqua appearance.\
+	\'95	Flash animations will no longer continue running once the page containing them has been closed.\
+	\'95	Upgraded the \'93Block flash animations\'94 code to use Flashblock 1.5.8.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\f0\b\fs30 \cf2 Features in Camino 2.0 Beta 1\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following changes and improvements have been made since the Camino 2.0 Alpha 1 release.
+\f0\b\fs30 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\f1\fs20 \cf2 Bookmarks & History\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Middle-clicking a bookmark on the Bookmark Bar now opens the bookmark in a new window or tab.\
+	\'95	It is now possible to drag a bookmark in the search results.\
+	\'95	Cancelling a search in Bookmarks or History now restores the open folder state.\
+	\'95	When an Address Book card has the \'93Company\'94 option selected, Camino now displays the company name as the bookmark title.\
+	\'95	Escape now cancels an edit in the Bookmarks Manager.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Downloading\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	On Mac OS X 10.5, Camino will bounce the downloads folder in the Dock when a download finishes.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Preferences\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Added an exceptions list to allow disabling \'93Block Flash animations\'94 on a per-site basis.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Privacy & Security\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Camino now supports importing PKCS#12 certificates with the 
+\f2 .pkcs12
+\f1  extension.\
+	\'95	The \'93Import\'94 command in the Certificates window now supports importing Certificate Authorities, website certificates, and personal certificates.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Tabs\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Tabs can be rearranged by dragging and dropping.\
+	\'95	Added an optional toolbar button for Tab Overview.\
+	\'95	Command-dragging a bookmark folder to a tab will now open the bookmarks in new tabs instead of replacing the current tabs.\
+	\'95	Site icons in tabs are now the same size as site icons in the location bar.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 User Interface\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Non-ASCII characters in URLs are now displayed in a readable format in the location bar and the autocomplete window.\
+	\'95	The down arrow will now display menus in search fields if the cursor is already at the end of the field.\
+	\'95	Command-D will now trigger the Bookmark sheet even when Caps Lock is on.\
+	\'95	When closing the Preferences window with Escape, Camino will no longer commit unsaved changes to text fields.\
+	\'95	Camino will now choose the most appropriately-sized icon when a web page\'92s site icon contains icons of multiple sizes.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Web Page Interaction\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	QuickTime movies and other plug-in content will now hide properly when switching tabs.\
+	\'95	Web pages now respect the Mac OS X preference for disabling text smoothing below a certain font size.\
+	\'95	Camino no longer detects certain non-feed URLs as feeds.\
+	\'95	Upgraded the \'93Block flash animations\'94 code to use Flashblock 1.5.7.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\f0\b\fs30 \cf2 Features in Camino 2.0 Alpha 1\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1\b0\fs20 \cf2 The following changes and improvements have been made since the Camino 1.6 release.
+\f0\b\fs30 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\f1\fs20 \cf2 General\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Camino 2.0 Alpha 1 requires Mac OS X 10.4 or higher.\
+	\'95	Uses version 1.9 of the Mozilla Gecko rendering engine.\
+\pard\tx1080\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-720\ql\qnatural
+\cf2 	\'95	Includes a new graphics architecture based on Quartz.\
+	\'95	Better compatibility with popular plug-ins.\
+	\'95	Significant improvements in Flash performance.\
+	\'95	Enhanced support for web standards.\
+	\'95	Supports JavaScript 1.8.\
+	\'95	Scroll bars in hidden portions of web pages no longer display.\
+	\'95	Better handling of pages with large tables.\
+	\'95	Web page form controls now respect author styling in more cases.\
+	\'95	Improved support for fonts and languages.\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+\cf2 	\'95	Upgraded to version 1.5b6 of the Sparkle software update framework.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Bookmarks & History\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	The History menu now contains a sub-menu listing the last 20 closed web pages.\
+	\'95	The importer for HTML bookmark files is now more stable and includes better support for bookmark attributes and for exported Firefox 3 bookmarks.\
+	\'95	Dropping a bookmark on a collection no longer switches the active collection.\
+	\'95	It is now possible to drag plain-text 
+\f2 javascript:
+\f1  URLs, such as bookmarklets, to the Bookmark Bar.\
+	\'95	Added a page translation bookmarklet to default bookmarks.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Preferences\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Changes to the font preferences now apply automatically.\
+	\'95	Changes to the \'93Home Page\'94 field in the General preference pane now apply without switching panes or closing the Preferences window.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Privacy & Security\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Camino now displays error pages for secure web pages using invalid or untrusted certificates.\
+	\'95	Camino now supports adding exceptions to allow access to secure web pages whose certificates are invalid or untrusted.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Tabs\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	The Tab Overview feature displays a grid of thumbnails of the tabs in the current window.\
+	\'95	The Command-T keyboard shortcut is now always enabled and will create a new tab in the frontmost browser window.\
+	\'95	The tab bar is now keyboard accessible.\
+	\'95	VoiceOver can now speak tab titles.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 User Interface\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	When Full Keyboard Access is enabled, tabbing now moves correctly through the entire browser window.\
+	\'95	The notification bar for blocked pop-ups is now keyboard accessible.\
+	\'95	Directory listings on local disks and FTP sites have a more pleasing appearance.\
+	\'95	The location bar autocomplete list now displays the site icon for each web page.\
+	\'95	Site icons and URLs in the location bar are updated correctly in more cases.\
+	\'95	Camino now better handles invalid characters in the location bar, the search field, and in bookmarks.\
+	\'95	The \'93Last Visited\'94 column in History and items in autocomplete lists no longer become editable on Mac OS X 10.5.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sb200\sa200\ql\qnatural
+
+\b \cf2 Web Page Interaction\
+\pard\tx360\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural
+
+\b0 \cf2 	\'95	Camino now has support for making the entire content of a web page bigger or smaller.\
+	\'95	Improved ad-blocking.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs30 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl320\sa60\ql\qnatural
+\cf2 Known Issues\
+\pard\tx360\tx720\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\sa200\ql\qnatural
+
+\f1\b0\fs20 \cf2 	\'95	Delete no longer functions as a keyboard shortcut for Back.\
+	\'95	Scroll bars appear active at all times.\
+	\'95	If \'93Ask me before accepting each cookie\'94 is checked, Camino will display a cookie dialog for each cookie request from a web page.\
+	\'95	Camino no longer supports Shockwave Player 10 and older; to display Shockwave content, install Shockwave Player 11 or newer.\
+	\'95	Version 2.2 of the Flip4Mac (F4M) plug-in for displaying Windows Media content causes major rendering issues in Camino. The Flip4Mac team has fixed this problem in version 2.2.1.11 of the plug-in.\
+	\'95	After visiting enough pages with Flash content while browsing, Camino may stop functioning correctly. Quitting and re-launching Camino will resolve the problem. This behavior is caused by a bug in the Flash plug-in and is fixed in version 10.0 of the plug-in.\
+	\'95	Some versions of the third-party add-on 1Password are not compatible with Camino. These versions can cause Camino to crash on launch, hang when importing bookmarks, and hang when pasting into the location bar. Make sure that you are running the latest version of 1Password, and if you continue to experience issues, disable 1Password\'92s integration with Camino and contact 1Password support.}

mozilla/camino/embed-replacements/content/global/crashes.xhtml

@@ -146,7 +146,7 @@ function populateReportList() {
     row.appendChild(cell);
     var link = document.createElement("a");
     link.setAttribute("href", reportURL + reports[i].id);
-    link.appendChild(document.createTextNode(reports[i].id));
+    link.appendChild(document.createTextNode("bp-" + reports[i].id));
     cell.appendChild(link);
 
     var date = new Date(reports[i].date);

mozilla/camino/embed-replacements/content/global/plugins.css

@@ -0,0 +1,143 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Organization.
+ * Portions created by the Initial Developer are Copyright (C) 1998-2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Robert Kaiser <KaiRo@KaiRo.at>
+ *   Philippe Wittenbergh (phiw@l-c-n.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/* ===== plugins.css =====================================================
+   == Styles used by the about:plugins page.
+   ======================================================================= */
+
+html {
+  background: -moz-Dialog;
+}
+
+body {
+  color: -moz-FieldText;
+  font: message-box;
+  position: relative;
+  min-width: 330px;
+  max-width: 80%;
+  margin: 4em auto;
+  border: 2px solid #dadada;
+  -moz-border-radius: 15px;
+  padding: 3em;
+  -moz-padding-start: 30px;
+  background: -moz-Field;
+}
+
+h1 {
+  margin: 0 0 .6em 0;
+  font-size: 240%;
+  color: #0141b7;
+  font-weight: normal;
+  text-align: left;
+  border-bottom: 1px solid ThreeDLightShadow;
+  padding-bottom: .2em;
+}
+
+hr {
+  margin: 1.5em 0;
+  border: none;
+  border-top: 1px solid #333;
+}
+
+#findmore {
+  margin-top: 2em;
+}
+
+.plugname {
+  margin-top: 2em;
+  margin-bottom: 1em;
+  font-size: 200%;
+  text-align: start;
+  font-weight: bold;
+}
+
+dl {
+  margin: 0 0 1em 0;
+}
+
+dd {
+  -moz-margin-start: 0;
+}
+
+dd:first-child + dd {
+  margin-bottom: 0.5em;
+}
+
+table {
+  background-color: -moz-Field;
+  color: -moz-DialogText;
+  font: message-box;
+  text-align: start;
+  width: 100%;
+  margin: 0;
+  border: 1px solid #666;
+  border-spacing: 0;
+}
+
+th, td {
+  border: none;
+  padding: 3px;
+}
+
+th {
+  text-align: center;
+  background-color: -moz-mac-secondaryhighlight;
+  color: -moz-DialogText;
+}
+
+th + th,
+td + td {
+  border-left: 1px solid #bbb;
+}
+
+td {
+  text-align: start;
+  border-top: 1px solid #bbb;
+}
+
+th.type, th.desc {
+  width: 25%;
+}
+
+th.suff {
+  width: 40%;
+}
+
+th.enabled {
+  width: 10%;
+}

mozilla/camino/embed-replacements/locale/en-US/global/netError.dtd

@@ -25,7 +25,7 @@
 <!ENTITY netInterrupt.longDesc "<p>Camino connected successfully, but the connection was interrupted while transferring information.  Please try again.</p><ul><li>Are you unable to browse other sites? Check the computer's network connection.</li><li>Still having trouble? Consult your network administrator or Internet provider for assistance.</li></ul>">
 
 <!ENTITY netOffline.title "Offline Mode">
-<!ENTITY netOffline.longDesc "<p>Camino is operating in its offline mode and cannot connect to the requested item.</p><ul><li>Is the computer connected to an active network?</li><li>Place Camino in online mode and try again.</li></ul>">
+<!ENTITY netOffline.longDesc "<p>Camino is operating in offline mode and cannot connect to the requested item.</p><ul><li>Is the computer connected to an active network?</li><li>Place Camino in online mode and try again.</li></ul>">
 
 <!ENTITY contentEncodingError.title "Content Encoding Error">
 <!ENTITY contentEncodingError.longDesc "<p>The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
@@ -59,7 +59,7 @@
 <!ENTITY unknownSocketType.longDesc "<p>The site responded to the network request in an unexpected way and Camino cannot continue.</p>">
 
 <!ENTITY nssFailure2.title "Secure Connection Failed">
-<!ENTITY nssFailure2.longDesc "<p>The page you are trying to view can not be shown because the authenticity of the received data could not be verified.</p><ul><li>Please contact the web site owners to inform them of this problem.</li></ul>">
+<!ENTITY nssFailure2.longDesc "<p>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</p><ul><li>Please contact the web site owners to inform them of this problem.</li></ul>">
 
 <!ENTITY nssBadCert.title "Secure Connection Failed">
 <!ENTITY nssBadCert.longDesc2 "<ul>

mozilla/camino/embed-replacements/skin/classic/global/about.css

@@ -0,0 +1,75 @@
+html {
+  background: -moz-Dialog;
+}
+
+body {
+  margin: 0;
+  padding: 0 1em;
+  color: -moz-FieldText;
+  font: message-box;
+  position: relative;
+  min-width: 330px;
+  max-width: 50em;
+  margin: 4em auto;
+  border: 2px solid #dadada;
+  -moz-border-radius: 15px;
+  padding: 3em;
+  -moz-padding-start: 30px;
+  background: -moz-Field;
+  -moz-box-shadow: -4px 4px 8px rgba(0,0,0,0.12), 4px 4px 8px rgba(0,0,0,0.12);
+}
+
+.aboutPageWideContainer {
+  max-width: 80% !important;
+}
+
+#aboutLogoContainer {
+  border: 1px solid ThreeDLightShadow;
+  width: 300px;
+  margin-bottom: 2em;
+}
+
+img {
+  border: 0;
+}
+
+#version {
+  font-weight: bold;
+  color: #909090;
+  margin: -24px 0 9px 17px;
+}
+
+h1 {
+  margin: 0 0 .6em 0;
+  font-size: 240%;
+  color: #0141b7;
+  font-weight: normal;
+  text-align: left !important;
+}
+
+h1:first-child {
+  border-bottom: 1px solid ThreeDLightShadow;
+  padding-bottom: .2em;
+}
+
+ul {
+  margin: 0;
+  -moz-margin-start: 1.5em;
+  padding: 0;
+  list-style: disc;
+}
+
+ul > li {
+  margin-top: .5em;
+}
+
+/* about:buildconfig is in quirksmode */
+table {
+  font-size: inherit;
+}
+
+hr {
+  margin: 1.5em 0;
+  border: none;
+  border-top: 1px solid #333;
+}

mozilla/camino/embed-replacements/skin/classic/global/aboutMemory.css

@@ -0,0 +1,97 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is about:memory.
+ *
+ * The Initial Developer of the Original Code is
+ *   Mozilla Corporation   
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Vladimir Vukicevic <vladimir@pobox.com>
+ *   Philippe Wittenbergh (phiw@l-c-n.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+html {
+  background: -moz-dialog;
+}
+
+body {
+  color: -moz-FieldText;
+  background: -moz-Field;
+  font: message-box;
+  margin: 4em auto;
+  padding: 3em;
+  min-width: 230px;
+  max-width: 40em;
+  border: 2px solid #dadada;
+  -moz-border-radius: 15px;
+  -moz-box-shadow: -4px 4px 8px rgba(0,0,0,0.12), 4px 4px 8px rgba(0,0,0,0.12);
+}
+
+h1 {
+  font-weight: normal;
+  font-size: 240%;
+  color: #0141b7;
+  background: transparent;
+  text-align: left;
+  border-bottom: 1px solid ThreeDLightShadow;
+  padding-bottom: .2em;
+  margin: 0 0 .6em 0;
+}
+
+label {
+  -moz-user-select: text;
+}
+
+h2 {
+  margin-top: 0;
+  font-weight: bold;
+  font-size: large;
+}
+
+.memBox {
+  max-width: 90%;
+  background: white;
+  color: inherit;
+  margin: 1em auto 0;
+  padding: 5px 5px 1em;
+  border-bottom: 1px solid ThreeDLightShadow;
+}
+
+.memBox:last-of-type {
+  border-bottom: none;
+  padding-bottom: 0;
+}
+
+.memValue {
+  text-align: right;
+}
+
+.memOverview table {
+  font-size: 120%;
+}

mozilla/camino/embed-replacements/skin/classic/global/config.css

@@ -65,6 +65,7 @@
   -moz-padding-start: 25px;
   margin-left: 1em;
   margin-right: 1em;
+  -moz-box-shadow: -4px 4px 8px rgba(0,0,0,0.12), 4px 4px 8px rgba(0,0,0,0.12);
 }
 
 #warningInnerBox

mozilla/camino/embed-replacements/skin/classic/global/dirListing/dirListing.css

@@ -19,6 +19,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ *   Philippe Wittenbergh (phiw@l-c-n.com)
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -54,6 +55,7 @@ body {
   margin: 4em auto;
   background-color: -moz-field;
   color: -moz-fieldtext;
+  -moz-box-shadow: -4px 4px 8px rgba(0,0,0,0.12), 4px 4px 8px rgba(0,0,0,0.12);
 }
 
 h1 {
@@ -89,6 +91,7 @@ table {
   clear: both;
   width: 90%;
   margin: 0 auto;
+  border-collapse: collapse;
 }
 
 thead {
@@ -100,13 +103,34 @@ th:last-child {
   text-align: center;
 }
 
+th:first-child {
+  -moz-padding-start: 36px;
+}
+
 th:hover > a {
   text-decoration: underline;
 }
 
+tbody > tr:nth-child(even) {
+  background: -moz-oddtreerow;
+}
+
 tbody > tr:hover {
-  outline: 1px solid ThreeDLightShadow;
-  -moz-outline-radius: .3em;
+  background-color: -moz-mac-secondaryhighlight;
+  color: inherit;
+  border: none;
+}
+
+td {
+  padding: 2px;
+}
+
+td:first-child {
+  -moz-padding-start: 16px;
+}
+
+td:last-child {
+  -moz-padding-end: 16px;
 }
 
 /* let 'Size' and 'Last Modified' take only as much space as they need and 'Name' all the rest */

mozilla/camino/embed-replacements/skin/classic/global/netError.css

@@ -57,6 +57,7 @@ ul {
   padding: 3em;
   -moz-padding-start: 60px;
   background: url("chrome://global/skin/icons/warning.png") 1.1em 1.6em no-repeat -moz-Field;
+  -moz-box-shadow: -4px 4px 8px rgba(0,0,0,0.12), 4px 4px 8px rgba(0,0,0,0.12);
 }
 
 /* #errorPageContainer.certerror {
@@ -157,6 +158,7 @@ body[dir="rtl"] #brand {
   background-image: url("chrome://global/skin/icons/blacklist.png");
   background-color: #e8e8e8;
   border: 2px solid black;
+  -moz-box-shadow: -4px 4px 8px rgba(0,0,0,0.3), 4px 4px 8px rgba(0,0,0,0.3);
 }
 
 :root.blacklist {

mozilla/camino/feedhandlers/InfoPlist.strings.in

@@ -3,4 +3,3 @@
 CFBundleName = "%FEED_HANDLER_DISPLAY_NAME%";
 CFBundleDisplayName = "%FEED_HANDLER_DISPLAY_NAME%";
 CFBundleGetInfoString = "%FEED_HANDLER_DISPLAY_NAME% 1.0, © 1998-%CM_COPYRIGHT_YEAR% Contributors";
-NSHumanReadableCopyright = "© 1998-%CM_COPYRIGHT_YEAR% Contributors";

mozilla/camino/flashblock/README

@@ -6,5 +6,6 @@ manifest.  A contents.rdf file is included to allow Camino to identify
 the contents of flashblock.jar.
 
 Camino's bundled Flashblock extension is currently synchronized with
-Flashblock 1.5.11 from
-http://downloads.mozdev.org/flashblock/flashblock-1.5.11.xpi.
+Flashblock 1.5.13+ from
+http://downloads.mozdev.org/flashblock/flashblock-1.5-unstable.xpi
+plus the fix for bug 573815.

mozilla/camino/flashblock/content/flashblock.css

@@ -12,10 +12,13 @@
 object[classid*=":D27CDB6E-AE6D-11cf-96B8-444553540000"],
 object[codebase*="swflash.cab"],
 object[data*=".swf"],
+object[type="application/x-shockwave-flash"],
+object[src*=".swf"],
 embed[type="application/x-shockwave-flash"],
 embed[src*=".swf"],
-object[type="application/x-shockwave-flash"],
-object[src*=".swf"]
+embed[allowscriptaccess],
+embed[flashvars],
+embed[wmode]
 { -moz-binding: url("chrome://flashblock/content/flashblock.xml#flash") !important; }
 
 /*
@@ -24,10 +27,10 @@ object[src*=".swf"]
 object[classid*=":166B1BCA-3F9C-11CF-8075-444553540000"],
 object[codebase*="sw.cab"],
 object[data*=".dcr"],
-embed[type="application/x-director"],
-embed[src*=".dcr"],
 object[type="application/x-director"],
-object[src*=".dcr"]
+object[src*=".dcr"],
+embed[type="application/x-director"],
+embed[src*=".dcr"]
 { -moz-binding: url("chrome://flashblock/content/flashblock.xml#director") !important; }
 
 /*
@@ -36,12 +39,26 @@ object[src*=".dcr"]
 object[classid*=":15B782AF-55D8-11D1-B477-006097098764"],
 object[codebase*="awswaxf.cab"],
 object[data*=".aam"],
-embed[type="application/x-authorware-map"],
-embed[src*=".aam"],
 object[type="application/x-authorware-map"],
-object[src*=".aam"]
+object[src*=".aam"],
+embed[type="application/x-authorware-map"],
+embed[src*=".aam"]
 { -moz-binding: url("chrome://flashblock/content/flashblock.xml#authorware") !important; }
 
+/*
+* Silverlight identifiers.
+*/
+object[classid*="32C73088-76AE-40F7-AC40-81F62CB2C1DA"],
+object[type="application/ag-plugin"],
+object[type="application/x-silverlight"],
+object[type="application/x-silverlight-2"],
+object[source*=".xaml"],
+object[sourceelement*="xaml"],
+object[data*="application/x-silverlight"],
+embed[type="application/ag-plugin"],
+embed[source*=".xaml"]
+{ -moz-binding: url("chrome://flashblock/content/flashblock.xml#silverlight") !important; }
+
 /*
 * Java identifiers.
 */
@@ -58,25 +75,11 @@ embed[type="application/x-java-applet"]
  -moz-binding: none !important;
 }
 
-/*
-* Silverlight identifiers.
-*/
-object[classid*="32C73088-76AE-40F7-AC40-81F62CB2C1DA"],
-object[type="application/ag-plugin"],
-object[type="application/x-silverlight"],
-object[source*=".xaml"],
-object[sourceelement*="xaml"],
-embed[type="application/ag-plugin"],
-embed[source*=".xaml"]
-{
- -moz-binding: none !important;
-}
-
 /*
  * Don't bind to objects with an explicit type=""
  * e.g. type="application/x-sibelius-score".
 */
-object[type]:not([type="application/x-shockwave-flash"]):not([type="application/x-director"]):not([type="application/x-authorware-map"]):not([data*=".swf"]):not([src*=".swf"])
+object[type]:not([type="application/x-shockwave-flash"]):not([type="application/x-director"]):not([type="application/x-authorware-map"]):not([data*=".swf"]):not([src*=".swf"]):not([type*="silverlight"])
 { -moz-binding: none !important; }
 
 /*
@@ -93,6 +96,5 @@ object
 
 span.sIFR-alternate {
   -moz-binding: url("chrome://flashblock/content/flashblock.xml#sifr-alternate") !important;
-  position: static !important;
   letter-spacing: normal !important;
 }

mozilla/camino/flashblock/content/flashblock.xml

@@ -37,6 +37,12 @@ function flashblockShowPlaceholder() {
 	// parent = current.parentNode;
 	var newParent = current.parentNode;
 	parent = newParent ? newParent : parent;
+
+	// Fix for Flashblock Bug 22168 (Node was not found" code: "8").
+	// if the LSB is 1, it means the nodes are unrelated (e.g. different window).
+	if (current.compareDocumentPosition(parent)&1)
+		return;
+
 	parent.insertBefore(placeholder, current);
 	if(placeholder.isStandalone) {
 		placeholder.flashblock = "frame";
@@ -55,8 +61,8 @@ function flashblockShowPlaceholder() {
 
 // Show the original animation
 function flashblockShowFlash(event) {
-    if( event.type == "keypress" && event.keyCode != KeyEvent.DOM_VK_RETURN)
-      return false;
+	if( event.type == "keypress" && event.keyCode != KeyEvent.DOM_VK_RETURN)
+		return false;
 	event.stopPropagation();
 	if(placeholder.flashblock == "frame") {
 		current.height = current.prevHeight;
@@ -79,27 +85,30 @@ function flashblockShowFlash(event) {
 			var mparam = placeholder.movieParam;
 			mparam[0].value = mparam[1];
 		}
-		if (placeholder.hasAttribute("embedsrc")) {
-			var embeds = current.getElementsByTagName("embed");
-			if (embeds && embeds.length > 0) {
-				embeds[0].setAttribute("src", placeholder.getAttribute("embedsrc"));
-			}
+		if (placeholder.srcParam) {
+			var mparam = placeholder.srcParam;
+			mparam[0].value = mparam[1];
+		}
+		if (placeholder.sourceParam) {
+			var mparam = placeholder.sourceParam;
+			mparam[0].value = mparam[1];
 		}
 	}
 	parent.removeChild(placeholder);
 }
 
-function flashblockIsWhitelisted() {
+function flashblockIsWhitelisted(node, type) {
 	// Check if the page that loaded the Flash site is whitelisted
 	// Thanks to Neil on #mozilla for suggesting this method, I would never have
 	// thought of it on my own. :-)
 	// Lor 20041215: Use "UIEvents" to make it work in post-1.0 FF
 	// (thanks to Neil again)
+	document.QueryInterface(Components.interfaces.nsIDOMDocument);
 	var flashblockEvent = document.createEvent("UIEvents");
-
 	if(flashblockEvent) {
-		flashblockEvent.initEvent("flashblockCheckLoad", true, true);
-		document.dispatchEvent(flashblockEvent);
+		var evt = type == "silverlight" ? "silverblockCheckLoad" : "flashblockCheckLoad";
+		flashblockEvent.initEvent(evt, true, true);
+		node.dispatchEvent(flashblockEvent);
 		if(flashblockEvent.getPreventDefault() == true) {
 			// Whitelisted
 			return true;
@@ -110,10 +119,18 @@ function flashblockIsWhitelisted() {
 
 function flashblockSetImage(placeholder, type) {
 	var inactiveurl = "url(chrome://flashblock/content/" + type + ".png) no-repeat center";
-	var activeurl = "url(chrome://flashblock/content/flashplay.png) no-repeat center";
+	var playimage = "url(chrome://flashblock/content/flashplay.png)";
+	switch (type) {
+		case "silverlight":
+			playimage = "url(chrome://flashblock/content/silverplay.png)";
+			break;
+		default:
+			break;
+	}
+	var activeurl = playimage + " no-repeat center";
 	placeholder.setAttribute("bgInactive", inactiveurl);
 	placeholder.setAttribute("bgActive", activeurl);
-	placeholder.style.background = inactiveurl;
+	placeholder.style.setProperty("background", inactiveurl, "important");
 }
 
 function flashblockStylePlaceholder(flash, placeholder, isStandalone) {
@@ -183,7 +200,7 @@ function flashblockSetTitle(current, placeholder, isStandalone) {
 		current.src = fakeURI;
 	}
 	else if (current.hasAttribute("src") ||
-			current.hasAttribute("data") ||
+			(current.hasAttribute("data") && !/application\/x-silverlight/.test(current.getAttribute("data"))) ||
 			current.hasAttribute("movie") ) {
 		var srcURI = current.getAttribute("src") ||
 			current.getAttribute("movie") ||
@@ -212,28 +229,57 @@ function flashblockSetTitle(current, placeholder, isStandalone) {
 				params[ii].value = fakeURI;
 				break;
 			}
+			if (params[ii].getAttribute("name") == "src" &&
+				params[ii].hasAttribute("value")) {
+				placeholder.title = params[ii].value;
+				placeholder.srcParam = [ params[ii], placeholder.title ];
+				params[ii].value = fakeURI;
+				break;
+			}
+			if (params[ii].getAttribute("name") == "source" &&
+				params[ii].hasAttribute("value")) {
+				placeholder.title = params[ii].value;
+				placeholder.sourceParam = [ params[ii], placeholder.title ];
+				params[ii].value = fakeURI;
+				break;
+			}
 		}
 	}
 }
 
-if(flashblockIsWhitelisted())
-	return;
+var type = this.flashblockType ? this.flashblockType : "flash"
+if (/silverlight|ag-plugin/i.test(this.getAttribute("type")) ||
+    /32C73088-76AE-40F7-AC40-81F62CB2C1DA/i.test(this.getAttribute("classid")) ) {
+  type = "silverlight";
+}
+
+if(flashblockIsWhitelisted(this, type))
+    return;
 
 var current = this;
 var parent = current.parentNode;
 
 // Check parent too (case of working EMBED inside broken OBJECT)
 if (current.overrideCTV || parentNode.overrideCTV) {
-	return;
+    return;
 }
 current.overrideCTV = true;
 
+// Flowplayer specific workaround.
+var flow = parent.getAttribute("href");
+if (flow) {
+    var prevDef = function (event) {
+        event.preventDefault();
+        event.currentTarget.removeEventListener("load", arguments.callee, true);
+    }
+    parent.addEventListener("click", prevDef , true)
+}
+
 // Create placeholder div
 var isStandalone = ("src" in current && current.src == current.ownerDocument.location);
 var placeholder = flashblockCreatePlaceholder(isStandalone);
 
 // Set placeholder image
-var type = this.flashblockType ? this.flashblockType : "flash"
 flashblockSetImage(placeholder, type);
 
 flashblockStylePlaceholder(current, placeholder, isStandalone);
@@ -246,11 +292,15 @@ flashblockSetTimeout(flashblockShowPlaceholder, 0);
 
 // Change the placeholder background when the mouse enters/exits the div.
 placeholder.addEventListener("mouseover",
-function(event) { event.target.style.background = event.target.getAttribute("bgActive"); },
+function(event) {event.target.style.setProperty("background",
+                                                 event.target.getAttribute("bgActive"),
+                                                 "important"); },
 "false"
 );
 placeholder.addEventListener("mouseout",
-function(event) { event.target.style.background = event.target.getAttribute("bgInactive"); },
+function(event) {event.target.style.setProperty("background",
+                                                 event.target.getAttribute("bgInactive"),
+                                                 "important"); },
 "false"
 );
 
@@ -279,6 +329,12 @@ placeholder.addEventListener("keypress", flashblockShowFlash, "false");
   </implementation>
 </binding>
 
+<binding id="silverlight" extends="#flash">
+  <implementation>
+    <field name="flashblockType">"silverlight"</field>
+  </implementation>
+</binding>
+
 <binding id="brokenobject">
   <implementation>
 
@@ -314,6 +370,12 @@ function flashblockShowPlaceholder() {
 	// parent = current.parentNode;
 	var newParent = current.parentNode;
 	parent = newParent ? newParent : parent;
+
+	// Fix for Flashblock Bug 22168 (Node was not found" code: "8").
+	// if the LSB is 1, it means the nodes are unrelated (e.g. different window).
+	if (current.compareDocumentPosition(parent)&1)
+		return;
+
 	parent.insertBefore(placeholder, current);
 	if(placeholder.isStandalone) {
 		placeholder.flashblock = "frame";
@@ -332,8 +394,8 @@ function flashblockShowPlaceholder() {
 
 // Show the original animation
 function flashblockShowFlash(event) {
-    if( event.type == "keypress" && event.keyCode != KeyEvent.DOM_VK_RETURN)
-      return false;
+	if( event.type == "keypress" && event.keyCode != KeyEvent.DOM_VK_RETURN)
+		return false;
 	event.stopPropagation();
 	if(placeholder.flashblock == "frame") {
 		current.height = current.prevHeight;
@@ -356,27 +418,30 @@ function flashblockShowFlash(event) {
 			var mparam = placeholder.movieParam;
 			mparam[0].value = mparam[1];
 		}
-		if (placeholder.hasAttribute("embedsrc")) {
-			var embeds = current.getElementsByTagName("embed");
-			if (embeds && embeds.length > 0) {
-				embeds[0].setAttribute("src", placeholder.getAttribute("embedsrc"));
-			}
+		if (placeholder.srcParam) {
+			var mparam = placeholder.srcParam;
+			mparam[0].value = mparam[1];
+		}
+		if (placeholder.sourceParam) {
+			var mparam = placeholder.sourceParam;
+			mparam[0].value = mparam[1];
 		}
 	}
 	parent.removeChild(placeholder);
 }
 
-function flashblockIsWhitelisted() {
+function flashblockIsWhitelisted(node, type) {
 	// Check if the page that loaded the Flash site is whitelisted
 	// Thanks to Neil on #mozilla for suggesting this method, I would never have
 	// thought of it on my own. :-)
 	// Lor 20041215: Use "UIEvents" to make it work in post-1.0 FF
 	// (thanks to Neil again)
+	document.QueryInterface(Components.interfaces.nsIDOMDocument);
 	var flashblockEvent = document.createEvent("UIEvents");
-
 	if(flashblockEvent) {
-		flashblockEvent.initEvent("flashblockCheckLoad", true, true);
-		document.dispatchEvent(flashblockEvent);
+		var evt = type == "silverlight" ? "silverblockCheckLoad" : "flashblockCheckLoad";
+		flashblockEvent.initEvent(evt, true, true);
+		node.dispatchEvent(flashblockEvent);
 		if(flashblockEvent.getPreventDefault() == true) {
 			// Whitelisted
 			return true;
@@ -387,10 +452,18 @@ function flashblockIsWhitelisted() {
 
 function flashblockSetImage(placeholder, type) {
 	var inactiveurl = "url(chrome://flashblock/content/" + type + ".png) no-repeat center";
-	var activeurl = "url(chrome://flashblock/content/flashplay.png) no-repeat center";
+	var playimage = "url(chrome://flashblock/content/flashplay.png)";
+	switch (type) {
+		case "silverlight":
+			playimage = "url(chrome://flashblock/content/silverplay.png)";
+			break;
+		default:
+			break;
+	}
+	var activeurl = playimage + " no-repeat center";
 	placeholder.setAttribute("bgInactive", inactiveurl);
 	placeholder.setAttribute("bgActive", activeurl);
-	placeholder.style.background = inactiveurl;
+	placeholder.style.setProperty("background", inactiveurl, "important");
 }
 
 function flashblockStylePlaceholder(flash, placeholder, isStandalone) {
@@ -460,7 +533,7 @@ function flashblockSetTitle(current, placeholder, isStandalone) {
 		current.src = fakeURI;
 	}
 	else if (current.hasAttribute("src") ||
-			current.hasAttribute("data") ||
+			(current.hasAttribute("data") && !/application\/x-silverlight/.test(current.getAttribute("data"))) ||
 			current.hasAttribute("movie") ) {
 		var srcURI = current.getAttribute("src") ||
 			current.getAttribute("movie") ||
@@ -489,12 +562,57 @@ function flashblockSetTitle(current, placeholder, isStandalone) {
 				params[ii].value = fakeURI;
 				break;
 			}
+			if (params[ii].getAttribute("name") == "src" &&
+				params[ii].hasAttribute("value")) {
+				placeholder.title = params[ii].value;
+				placeholder.srcParam = [ params[ii], placeholder.title ];
+				params[ii].value = fakeURI;
+				break;
+			}
+			if (params[ii].getAttribute("name") == "source" &&
+				params[ii].hasAttribute("value")) {
+				placeholder.title = params[ii].value;
+				placeholder.sourceParam = [ params[ii], placeholder.title ];
+				params[ii].value = fakeURI;
+				break;
+			}
 		}
 	}
 }
 
-if(flashblockIsWhitelisted())
-	return;
+function isBrokenFlash(element) {
+	var params = element.getElementsByTagName("param");
+	var isFlash = false;
+	for (var ii = 0; ii < params.length; ii++) {
+		var pvalue = params[ii].getAttribute("value");
+		if (/\.swf/i.test(pvalue))
+			return true;
+		var pname = params[ii].getAttribute("name");
+		if (/movie/i.test(pname))
+			return true;
+	}
+	var embeds = element.getElementsByTagName("embed");
+	for (var jj = 0; jj < embeds.length; jj++) {
+		var embed = embeds[jj];
+		if (/x-shockwave-flash/i.test(embed.getAttribute("type")) ||
+			/\.swf/i.test(embed.getAttribute("src"))) {
+			return true;
+		}
+	}
+	return false;
+}
+
+var type = this.flashblockType ? this.flashblockType : "flash"
+if (/silverlight|ag-plugin/i.test(this.getAttribute("type")) ||
+    /32C73088-76AE-40F7-AC40-81F62CB2C1DA/i.test(this.getAttribute("classid")) ) {
+  type = "silverlight";
+}
+
+if(flashblockIsWhitelisted(this, type))
+    return;
+
+if (!isBrokenFlash(this))
+    return;
 
 var current = this;
 var parent = current.parentNode;
@@ -505,32 +623,21 @@ if (current.overrideCTV || parentNode.overrideCTV) {
 }
 current.overrideCTV = true;
 
-var params = this.getElementsByTagName("param");
-var isFlash = false;
-for (var ii = 0; ii < params.length; ii++) {
-	var pvalue = params[ii].getAttribute("value");
-	if (/\.swf/i.test(pvalue)) {
-		isFlash = true;
-		break;
+// Flowplayer specific workaround.
+var flow = parent.getAttribute("href");
+if (flow) {
+	var prevDef = function (event) {
+		event.preventDefault();
+		event.currentTarget.removeEventListener("load", arguments.callee, true);
 	}
+	parent.addEventListener("click", prevDef , true)
 }
-var embeds = this.getElementsByTagName("embed");
-for (var jj = 0; jj < embeds.length; jj++) {
-	var embed = embeds[jj];
-	if (/x-shockwave-flash/i.test(embed.getAttribute("type")) ||
-		/\.swf/i.test(embed.getAttribute("src"))) {
-		isFlash = true;
-		break;
-	}
-}
-if (!isFlash) {return;}
 
 // Create placeholder div
 var isStandalone = ("src" in current && current.src == current.ownerDocument.location);
 var placeholder = flashblockCreatePlaceholder(isStandalone);
 
 // Set placeholder image
-var type = this.flashblockType ? this.flashblockType : "flash"
 flashblockSetImage(placeholder, type);
 
 flashblockStylePlaceholder(current, placeholder, isStandalone);
@@ -543,11 +650,15 @@ flashblockSetTimeout(flashblockShowPlaceholder, 0);
 
 // Change the placeholder background when the mouse enters/exits the div.
 placeholder.addEventListener("mouseover",
-function(event) { event.target.style.background = event.target.getAttribute("bgActive"); },
+function(event) {event.target.style.setProperty("background",
+                                                 event.target.getAttribute("bgActive"),
+                                                 "important"); },
 "false"
 );
 placeholder.addEventListener("mouseout",
-function(event) { event.target.style.background = event.target.getAttribute("bgInactive"); },
+function(event) {event.target.style.setProperty("background",
+                                                 event.target.getAttribute("bgInactive"),
+                                                 "important"); },
 "false"
 );
 
@@ -568,6 +679,8 @@ placeholder.addEventListener("keypress", flashblockShowFlash, "false");
   <implementation>
     <constructor>
         <![CDATA[
+
+document.QueryInterface(Components.interfaces.nsIDOMDocument);
 event = document.createEvent("UIEvents");
 
 if(event) {
@@ -593,6 +706,8 @@ this.style.overflow ="hidden";
   <implementation>
     <constructor>
         <![CDATA[
+
+document.QueryInterface(Components.interfaces.nsIDOMDocument);
 var event = document.createEvent("UIEvents");
 
 if(event) {
@@ -611,6 +726,7 @@ this.style.setProperty("top", "auto", "important");
 this.style.setProperty("height", "auto", "important");
 this.style.setProperty("width", "auto", "important");
 //this.style.position = "static";
+this.style.setProperty("position", "static", "important");
         ]]>
     </constructor>
   </implementation>

mozilla/camino/google-breakpad/README_CAMINO

@@ -4,4 +4,8 @@ for more information.
 
 This is a pull of r366 from the svn repository at:
   http://google-breakpad.googlecode.com/svn/trunk/
-with the testing and non-mac platform directories stripped out.
+with the testing and non-mac platform directories stripped out, and the patches
+for:
+- http://code.google.com/p/google-breakpad/issues/detail?id=348
+- http://code.google.com/p/google-breakpad/issues/detail?id=349
+applied locally.

mozilla/camino/google-breakpad/src/client/mac/sender/crash_report_sender.m

@@ -609,6 +609,12 @@ NSString *const kDefaultServerType = @"google";
   float emailLabelWidthDelta = [emailLabel_ breakpad_adjustWidthToFit];
   [emailEntryField_ breakpad_shiftHorizontally:emailLabelWidthDelta];
 
+  // Localize the placeholder text.
+  [[commentsEntryField_ cell]
+      setPlaceholderString:NSLocalizedString(@"commentsPlaceholder", @"")];
+  [[emailEntryField_ cell]
+      setPlaceholderString:NSLocalizedString(@"emailPlaceholder", @"")];
+
   // Localize the privacy policy label, and keep it right-aligned to the arrow.
   [privacyLinkLabel_ setStringValue:NSLocalizedString(@"privacyLabel", @"")];
   float privacyLabelWidthDelta = [privacyLinkLabel_ breakpad_adjustWidthToFit];
@@ -895,6 +901,8 @@ doCommandBySelector:(SEL)commandSelector {
                          forKey:@BREAKPAD_PRODUCT];
   [socorroDictionary_ setObject:@"ProductName"
                          forKey:@BREAKPAD_PRODUCT];
+  [socorroDictionary_ setObject:@"Email"
+                         forKey:@BREAKPAD_EMAIL];
 }
 
 - (NSMutableDictionary *)dictionaryForServerType:(NSString *)serverType {

mozilla/camino/growl/Common/Source/CFGrowlAdditions.c

@@ -85,10 +85,10 @@ STRING_TYPE createStringWithStringAndCharacterAndString(STRING_TYPE str0, UniCha
 	CFStringRef cfstr1 = (CFStringRef)str1;
 	CFIndex len0 = (cfstr0 ? CFStringGetLength(cfstr0) : 0);
 	CFIndex len1 = (cfstr1 ? CFStringGetLength(cfstr1) : 0);
-	unsigned length = (len0 + (ch != 0xffff) + len1);
+	size_t length = (len0 + (ch != 0xffff) + len1);
 
 	UniChar *buf = malloc(sizeof(UniChar) * length);
-	unsigned i = 0U;
+	size_t i = 0U;
 
 	if (cfstr0) {
 		CFStringGetCharacters(cfstr0, CFRangeMake(0, len0), buf);
@@ -222,8 +222,8 @@ STRING_TYPE createStringWithAddressData(DATA_TYPE aAddressData) {
 STRING_TYPE createHostNameForAddressData(DATA_TYPE aAddressData) {
 	char hostname[NI_MAXHOST];
 	struct sockaddr *socketAddress = (struct sockaddr *)CFDataGetBytePtr(aAddressData);
-	if (getnameinfo(socketAddress, CFDataGetLength(aAddressData),
-					hostname, sizeof(hostname),
+	if (getnameinfo(socketAddress, (socklen_t)CFDataGetLength(aAddressData),
+					hostname, (socklen_t)sizeof(hostname),
 					/*serv*/ NULL, /*servlen*/ 0,
 					NI_NAMEREQD))
 		return NULL;
@@ -345,9 +345,11 @@ URL_TYPE createURLByMakingDirectoryAtURLWithName(URL_TYPE parent, STRING_TYPE na
 					NSLog(CFSTR("in createURLByMakingDirectoryAtURLWithName in CFGrowlAdditions: could not create directory '%@' in parent directory at %@: FSCreateDirectoryUnicode returned %li (please tell the Growl developers)"), name, parent, (long)err);
 			}
 
-			CFRelease(parent);
 		} //if (name)
-		CFRelease(name);
+		if(parent)
+			CFRelease(parent);
+		if(name)
+			CFRelease(name);
 	} //if (parent)
 
 end:
@@ -524,7 +526,7 @@ static OSStatus GrowlCopyObjectSync(const FSRef *fileRef, const FSRef *destRef,
 	struct FSForkIOParam forkPB = {
 		.ref = fileRef,
 		.forkIterator = {
-			.initialize = 0L
+			.initialize = 0
 		},
 		.outForkName = &forkName,
 	};

mozilla/camino/growl/Common/Source/CFURLAdditions.c

@@ -102,11 +102,10 @@ URL_TYPE createFileURLWithDockDescription(DICTIONARY_TYPE dict) {
 	if (!url) {
 		if (path) {
 			CFNumberRef pathStyleNum = CFDictionaryGetValue(dict, _CFURLStringTypeKey);
-			CFURLPathStyle pathStyle;
+			CFURLPathStyle pathStyle = kCFURLPOSIXPathStyle;
+			
 			if (pathStyleNum)
 				CFNumberGetValue(pathStyleNum, kCFNumberIntType, &pathStyle);
-			else
-				pathStyleNum = kCFURLPOSIXPathStyle;
 
 			char *filename = createFileSystemRepresentationOfString(path);
 			int fd = open(filename, O_RDONLY, 0);

mozilla/camino/growl/Common/Source/GrowlDefinesInternal.h

@@ -29,6 +29,48 @@
  *	 GrowlDefines.h.
  */
 
+/*!
+ * @defined NSInteger
+ * @abstract Typedef to int so Growl will compile on pre-10.5 SDKs.
+ */
+#ifndef NSINTEGER_DEFINED
+typedef int NSInteger;
+typedef unsigned int NSUInteger;
+#define NSINTEGER_DEFINED
+#endif
+
+/*!
+ * @defined CGFloat
+ * @abstract Typedef to float so Growl will compile on pre-10.5 SDKs.
+ */
+#ifndef CGFLOAT_DEFINED
+typedef float CGFloat;
+#define CGFLOAT_IS_DOUBLE 0
+#define CGFLOAT_DEFINED
+#endif
+
+/*!
+ * @defined GrowlCGFloatCeiling()
+ * @abstract Macro for the ceil() function that uses a different precision depending on the CPU architecture.
+ */
+/*!
+ * @defined GrowlCGFloatAbsoluteValue()
+ * @abstract Macro for the fabs() function that uses a different precision depending on the CPU architecture.
+ */
+/*!
+ * @defined GrowlCGFloatFloor()
+ * @abstract Macro for the floor() function that uses a different precision depending on the CPU architecture.
+ */
+#if CGFLOAT_IS_DOUBLE
+#define GrowlCGFloatCeiling(x) ceil(x)
+#define GrowlCGFloatAbsoluteValue(x) fabs(x)
+#define GrowlCGFloatFloor(x) floor(x)
+#else
+#define GrowlCGFloatCeiling(x) ceilf(x)
+#define GrowlCGFloatAbsoluteValue(x) fabsf(x)
+#define GrowlCGFloatFloor(x) floorf(x)
+#endif
+
 /*!	@defined	GROWL_TCP_PORT
  *	@abstract	The TCP listen port for Growl notification servers.
  */
@@ -251,6 +293,7 @@ struct GrowlNetworkNotification {
 #define GROWL_PATHWAY_EXTENSION                 XSTR("growlPathway")
 #define GROWL_VIEW_EXTENSION					XSTR("growlView")
 #define GROWL_STYLE_EXTENSION					XSTR("growlStyle")
+#define GROWL_PATHEXTENSION_TICKET				XSTR("growlTicket")
 
 /* --- These following macros are intended for plug-ins --- */
 
@@ -390,6 +433,15 @@ struct GrowlNetworkNotification {
  *	@param	domain	The bundle ID of the plug-in.
  *	@param	result	A pointer to a float. Leaves unchanged if the value doesn't exist.
  */
+#ifdef __LP64__
+#define READ_GROWL_PREF_FLOAT(key, domain, result) do {\
+	CFNumberRef floatValue = NULL; \
+	READ_GROWL_PREF_VALUE(key, domain, CFNumberRef, &floatValue); \
+	if (floatValue) {\
+		CFNumberGetValue(floatValue, kCFNumberCGFloatType, result); \
+		CFRelease(floatValue); \
+	} } while(0)
+#else
 #define READ_GROWL_PREF_FLOAT(key, domain, result) do {\
 	CFNumberRef floatValue = NULL; \
 	READ_GROWL_PREF_VALUE(key, domain, CFNumberRef, &floatValue); \
@@ -397,6 +449,7 @@ struct GrowlNetworkNotification {
 		CFNumberGetValue(floatValue, kCFNumberFloatType, result); \
 		CFRelease(floatValue); \
 	} } while(0)
+#endif
 
 /*!	@function    WRITE_GROWL_PREF_FLOAT
  *	@abstract    Writes the given float to the plug-in's preferences.
@@ -406,10 +459,17 @@ struct GrowlNetworkNotification {
  *	@param	value	The float value to write to the preferences.
  *	@param	domain	The bundle ID of the plug-in.
  */
+#ifdef __LP64__
+#define WRITE_GROWL_PREF_FLOAT(key, value, domain) do {\
+	CFNumberRef floatValue = CFNumberCreate(NULL, kCFNumberCGFloatType, &value); \
+	WRITE_GROWL_PREF_VALUE(key, floatValue, domain); \
+	CFRelease(floatValue); } while(0)
+#else
 #define WRITE_GROWL_PREF_FLOAT(key, value, domain) do {\
 	CFNumberRef floatValue = CFNumberCreate(NULL, kCFNumberFloatType, &value); \
 	WRITE_GROWL_PREF_VALUE(key, floatValue, domain); \
 	CFRelease(floatValue); } while(0)
+#endif
 
 
 /*!	@defined	GROWL_CLOSE_ALL_NOTIFICATIONS

mozilla/camino/growl/Common/Source/GrowlNonCopyingMutableDictionary.h

@@ -1,21 +0,0 @@
-//
-//	GrowlNonCopyingMutableDictionary.h
-//	Growl
-//
-//	Created by Mac-arena the Bored Zo on 2005-08-21.
-//	Copyright 2005-2006 The Growl Project. All rights reserved.
-//
-//	This file is under the BSD License, refer to License.txt for details
-
-#import <Foundation/Foundation.h>
-
-@interface GrowlNonCopyingMutableDictionary: NSMutableDictionary
-{
-	NSMapTable *backing;
-}
-
-+ (id) dictionaryWithMapTable:(NSMapTable *)otherBacking;
-
-- (id) initWithMapTable:(NSMapTable *)otherBacking;
-
-@end

mozilla/camino/growl/Common/Source/GrowlNonCopyingMutableDictionary.m

@@ -1,226 +0,0 @@
-//
-//	GrowlNonCopyingMutableDictionary.m
-//	Growl
-//
-//	Created by Mac-arena the Bored Zo on 2005-08-21.
-//	Copyright 2005-2006 The Growl Project. All rights reserved.
-//
-//	This file is under the BSD License, refer to License.txt for details
-
-#import "GrowlNonCopyingMutableDictionary.h"
-
-//the enumerator class can be moved to its own pair of files if an immutable non-copying dictionary class is created.
-@interface GrowlNonCopyingDictionaryEnumerator: NSEnumerator
-{
-	NSMapEnumerator mapEnum;
-	unsigned reserved: 30;
-	unsigned yieldKeys: 1;
-	unsigned hasFreed: 1;
-}
-
-//if flag is NO, objects (values) will be yielded by -nextObject.
-//otherwise, keys will be yielded.
-- (id) initWithMapEnumerator:(NSMapEnumerator)newMapEnum enumerateKeys:(BOOL)flag;
-
-@end
-
-@implementation GrowlNonCopyingMutableDictionary
-
-- (id) superInit {
-	SEL init = @selector(init);
-	//jump over superclasses (NSMutableDictionary and NSDictionary)
-	return [[[super superclass] superclass] instanceMethodForSelector:init](self, init);
-}
-
-#pragma mark -
-
-- (id) init {
-	if ((self = [self superInit])) {
-		backing = NSCreateMapTableWithZone(NSObjectMapKeyCallBacks, NSObjectMapValueCallBacks, 0U, [self zone]);
-	}
-	return self;
-}
-
-#pragma mark -
-
-- (id) initWithCapacity:(unsigned)capacity {
-	if ((self = [self superInit])) {
-		backing = NSCreateMapTableWithZone(NSObjectMapKeyCallBacks, NSObjectMapValueCallBacks, capacity, [self zone]);
-	}
-	return self;
-}
-
-#pragma mark -
-
-- (id) initWithDictionary:(NSDictionary *)other {
-	NSParameterAssert(other != nil);
-	if ((self = [self initWithCapacity:[other count]]))
-		[self setDictionary:other];
-	return self;
-}
-
-#pragma mark -
-
-//more -init.. methods can go here.
-
-//#pragma mark -
-
-+ (id) dictionaryWithMapTable:(NSMapTable *)otherBacking {
-	return [[[self alloc] initWithMapTable:otherBacking] autorelease];
-}
-
-- (id) initWithMapTable:(NSMapTable *)otherBacking {
-	if ((self = [self superInit])) {
-		backing = NSCopyMapTableWithZone(otherBacking, [self zone]);
-	}
-	return self;
-}
-
-#pragma mark -
-
-- (void) dealloc {
-	NSFreeMapTable(backing);
-
-	[super dealloc];
-}
-
-#pragma mark -
-#pragma mark Adding and changing values
-
-- (id) objectForKey:(id)key {
-	return NSMapGet(backing, key);
-}
-
-- (id) valueForKey:(NSString *)key {
-	return [self objectForKey:key];
-}
-
-#pragma mark -
-
-- (void) setObject:(id)obj forKey:(id)key {
-	NSMapInsert(backing, key, obj);
-}
-
-- (void) setValue:(id)obj forKey:(NSString *)key {
-	if (obj)
-		NSMapInsert(backing, key, obj);
-	else
-		NSMapRemove(backing, key);
-}
-
-#pragma mark -
-
-- (void) addEntriesFromDictionary:(NSDictionary *)other {
-	NSParameterAssert(other);
-
-	NSEnumerator *keyEnum = [other keyEnumerator];
-	id key;
-	while ((key = [keyEnum nextObject]))
-		NSMapInsert(backing, key, [other objectForKey:key]);
-}
-- (void) setDictionary:(NSDictionary *)other {
-	NSParameterAssert(other);
-
-	[self removeAllObjects];
-	[self addEntriesFromDictionary:other];
-}
-
-#pragma mark -
-#pragma mark Removing values
-
-- (void) removeObjectForKey:(id)key {
-	NSMapRemove(backing, key);
-}
-- (void) removeObjectsForKeys:(NSArray *)keys {
-	NSEnumerator *keyEnum = [keys objectEnumerator];
-	id key;
-	while((key = [keyEnum nextObject]))
-		[self removeObjectForKey:key];
-}
-
-- (void) removeAllObjects {
-	NSResetMapTable(backing);
-}
-
-#pragma mark -
-#pragma mark Examination
-
-- (NSArray *) allKeys {
-	return NSAllMapTableKeys(backing);
-}
-
-- (NSArray *) allValues {
-	return NSAllMapTableValues(backing);
-}
-
-- (NSEnumerator *) keyEnumerator {
-	//enumerateKeys: YES
-	return [[[GrowlNonCopyingDictionaryEnumerator allocWithZone:[self zone]] initWithMapEnumerator:NSEnumerateMapTable(backing) enumerateKeys:YES] autorelease];
-}
-
-- (NSEnumerator *) objectEnumerator {
-	//enumerateKeys: NO
-	return [[[GrowlNonCopyingDictionaryEnumerator allocWithZone:[self zone]] initWithMapEnumerator:NSEnumerateMapTable(backing) enumerateKeys:NO] autorelease];
-}
-
-#pragma mark -
-
-- (unsigned) count {
-	return NSCountMapTable(backing);
-}
-
-- (NSString *) description {
-	NSMutableArray *elements = [[NSMutableArray alloc] initWithCapacity:[self count]];
-
-	NSMapEnumerator backingEnum = NSEnumerateMapTable(backing);
-	NSObject *key, *value;
-	while(NSNextMapEnumeratorPair(&backingEnum, (void **)&key, (void **)&value)) {
-		NSString *pairDesc = [[NSString alloc] initWithFormat:@"\t%@ = %@", [key description], [value description]];
-		[elements addObject:pairDesc];
-		[pairDesc release];
-	}
-	NSEndMapTableEnumeration(&backingEnum);
-
-	NSString *desc = [[[NSString allocWithZone:[self zone]] initWithFormat:@"{\n%@}", [elements componentsJoinedByString:@";\n"]] autorelease];
-	[elements release];
-	return desc;
-}
-
-@end
-
-#pragma mark -
-
-@implementation GrowlNonCopyingDictionaryEnumerator
-
-- (id) initWithMapEnumerator:(NSMapEnumerator)newMapEnum enumerateKeys:(BOOL)flag {
-	if ((self = [self init])) {
-		mapEnum = newMapEnum;
-		yieldKeys = (flag != NO);
-	}
-	return self;
-}
-
-- (void) dealloc {
-	if (!hasFreed)
-		NSEndMapTableEnumeration(&mapEnum);
-
-	[super dealloc];
-}
-
-#pragma mark -
-
-- (id) nextObject {
-	void *key, *value;
-	if (!NSNextMapEnumeratorPair(&mapEnum, &key, &value)) {
-		if (!hasFreed) {
-			NSEndMapTableEnumeration(&mapEnum);
-			hasFreed = YES;
-		}
-		return nil;
-	} else if (yieldKeys)
-		return key;
-	else
-		return value;
-}
-
-@end

mozilla/camino/growl/Common/Source/GrowlPathUtilities.m

@@ -8,8 +8,6 @@
 // This file is under the BSD License, refer to License.txt for details
 
 #import "GrowlPathUtilities.h"
-#import "GrowlPreferencesController.h"
-#import "GrowlTicketController.h"
 #import "GrowlDefinesInternal.h"
 
 static NSBundle *helperAppBundle;
@@ -35,15 +33,16 @@ restart:;
 	UInt32 oldestProcessLaunchDate = UINT_MAX;
 
 	while ((err = GetNextProcess(&psn)) == noErr) {
-		struct ProcessInfoRec info = { .processInfoLength = sizeof(struct ProcessInfoRec) };
+		struct ProcessInfoRec info = { .processInfoLength = (UInt32)sizeof(struct ProcessInfoRec) };
 		err = GetProcessInformation(&psn, &info);
 		if (err == noErr) {
 			//Compare the launch dates first, since it's cheaper than comparing bundle IDs.
 			if (info.processLaunchDate < oldestProcessLaunchDate) {
 				//This one is older (fewer ticks since startup), so this is our current prospect to be the result.
 				NSDictionary *dict = (NSDictionary *)ProcessInformationCopyDictionary(&psn, kProcessDictionaryIncludeAllInformationMask);
-
+				
 				if (dict) {
+					CFMakeCollectable(dict);
 					pid_t pid = 0;
 					GetProcessPID(&psn, &pid);
 					if ([[dict objectForKey:(NSString *)kCFBundleIdentifierKey] isEqualToString:identifier]) {

mozilla/camino/growl/Common/Source/GrowlVersionUtilities.h

@@ -60,7 +60,7 @@ CFComparisonResult compareVersions(const struct Version a, const struct Version
 CFComparisonResult compareVersionStrings(STRING_TYPE a, STRING_TYPE b);
 /*this version contains brain damage that translates "1.0" to "0.5" (handling
  *	the Growl 0.5 prefpane bundle, whose version was mistakenly set to "1.0").
- *the real Growl 1.0 prefpane bundle will have a version of "1.00".
+ *Because of that mistake, the version that we had intended to be 1.0 became 1.1 instead.
  */
 CFComparisonResult compareVersionStringsTranslating1_0To0_5(STRING_TYPE a, STRING_TYPE b);
 

mozilla/camino/growl/Core/Source/GrowlAbstractSingletonObject.h

@@ -1,71 +0,0 @@
-//
-//  GrowlAbstractSingletonObject.h
-//  GBUtilities
-//
-//	Renamed from GBAbstractSingletonObject to GrowlAbstractSingletonObject.
-//  Created by Ofri Wolfus on 15/08/05.
-//  Copyright 2005-2006 The Growl Project. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-
-/*!
- * @class GrowlAbstractSingletonObject
- * @brief An Abstract Singleton Object
- *
- * This is an abstract object for object that should have only one instnace
- * that is never released (singleton object).
- * This class is thread safe.
- */
-@interface GrowlAbstractSingletonObject : NSObject {
-	BOOL	_isInitialized;
-}
-
-/*!
- * @brief Returns the shared instance of this class.
- */
-+ (id) sharedInstance;
-
-/*!
- * @brief Releases and deallocates all the singletons that are subclasses of this object.
- *
- * Once +destroyAllSingletons has been called, no more singletons can be created
- * and every call to [SomeSingletonSubclass sharedInstance] will return nil.
- * Also note that a call to this method will destroy GBAbstractSingletonObject and all it's subclasses.
- * Even though that you generally can't release a singleton object, it's dealloc message WILL be called
- * when it's beeing destroyed.
- *
- * USE THIS METHOD WITH GREAT CAUTION!!!
- */
-+ (void) destroyAllSingletons;
-
-@end
-
-/*!
- * @category GrowlSingletonObjectInit
- * @brief A private category for subclasses only.
- *
- * Only subclasses should override/call methods in the category.
- */
-@interface GrowlAbstractSingletonObject (GrowlAbstractSingletonObjectInit)
-
-/*!
- * @brief An init method for your singleton object.
- *
- * Implement this in your subclass to init your shared object.
- * You should call [super initSingleton] and return your initialized object.
- * Never call this method directly! It'll be automatically called when needed.
- */
-- (id) initSingleton;
-
-/*!
- * @brief Finish and clean up whatever your singleton does.
- *
- * This will be called before the singleton will be destroyed.
- * You should put whatever you would put in the -dealloc method here instead
- * and then call [super destroy].
- */
-- (void) destroy;
-
-@end

mozilla/camino/growl/Core/Source/GrowlImageAdditions.h

@@ -8,10 +8,11 @@
 // This file is under the BSD License, refer to License.txt for details
 
 #import <Cocoa/Cocoa.h>
+#import "GrowlDefinesInternal.h"	// for CGFloat
 
 @interface NSImage (GrowlImageAdditions)
 
-- (void) drawScaledInRect:(NSRect)targetRect operation:(NSCompositingOperation)operation fraction:(float)f;
+- (void) drawScaledInRect:(NSRect)targetRect operation:(NSCompositingOperation)operation fraction:(CGFloat)f;
 - (NSSize) adjustSizeToDrawAtSize:(NSSize)theSize;
 - (NSImageRep *) bestRepresentationForSize:(NSSize)theSize;
 - (NSImageRep *) representationOfSize:(NSSize)theSize;

mozilla/camino/growl/Core/Source/GrowlImageAdditions.m

@@ -11,23 +11,23 @@
 
 @implementation NSImage (GrowlImageAdditions)
 
-- (void) drawScaledInRect:(NSRect)targetRect operation:(NSCompositingOperation)operation fraction:(float)f {
+- (void) drawScaledInRect:(NSRect)targetRect operation:(NSCompositingOperation)operation fraction:(CGFloat)f {
 	if (!NSEqualSizes([self size], targetRect.size))
 		[self adjustSizeToDrawAtSize:targetRect.size];
 	NSRect imageRect;
-	imageRect.origin.x = 0.0f;
-	imageRect.origin.y = 0.0f;
+	imageRect.origin.x = 0.0;
+	imageRect.origin.y = 0.0;
 	imageRect.size = [self size];
 	if (imageRect.size.width > targetRect.size.width || imageRect.size.height > targetRect.size.height) {
 		// make sure the icon isn't too large. If it is, scale it down
 		if (imageRect.size.width > imageRect.size.height) {
-			float oldHeight = targetRect.size.height;
+			CGFloat oldHeight = targetRect.size.height;
 			targetRect.size.height = oldHeight / imageRect.size.width * imageRect.size.height;
-			targetRect.origin.y = floorf(targetRect.origin.y - (targetRect.size.height - oldHeight) * 0.5f);
+			targetRect.origin.y = GrowlCGFloatFloor(targetRect.origin.y - (targetRect.size.height - oldHeight) * 0.5);
 		} else if (imageRect.size.width < imageRect.size.height) {
-			float oldWidth = targetRect.size.width;
+			CGFloat oldWidth = targetRect.size.width;
 			targetRect.size.width = oldWidth / imageRect.size.height * imageRect.size.width;
-			targetRect.origin.x = floorf(targetRect.origin.x - (targetRect.size.width - oldWidth) * 0.5f);
+			targetRect.origin.x = GrowlCGFloatFloor(targetRect.origin.x - (targetRect.size.width - oldWidth) * 0.5);
 		}
 
 		[self setScalesWhenResized:YES];
@@ -35,9 +35,9 @@
 	} else {
 		// center image if it is too small
 		if (imageRect.size.width < targetRect.size.width)
-			targetRect.origin.x += ceilf((targetRect.size.width - imageRect.size.width) * 0.5f);
+			targetRect.origin.x += GrowlCGFloatCeiling((targetRect.size.width - imageRect.size.width) * 0.5);
 	 	if (imageRect.size.height < targetRect.size.height)
-			targetRect.origin.y += ceilf((targetRect.size.height - imageRect.size.height) * 0.5f);
+			targetRect.origin.y += GrowlCGFloatCeiling((targetRect.size.height - imageRect.size.height) * 0.5);
 		targetRect.size = imageRect.size;
 	}
 
@@ -55,14 +55,14 @@
 	NSImageRep *bestRep = [self representationOfSize:theSize];
 	if (!bestRep) {
 		BOOL isFirst = YES;
-		float repDistance = 0.0f;
+		CGFloat repDistance = 0.0;
 		NSImageRep *thisRep;
 		NSEnumerator *enumerator = [[self representations] objectEnumerator];
 		while ((thisRep = [enumerator nextObject])) {
-			float thisDistance = theSize.width - [thisRep size].width;
-			if (repDistance < 0.0f && thisDistance > 0.0f)
+			CGFloat thisDistance = theSize.width - [thisRep size].width;
+			if (repDistance < 0.0 && thisDistance > 0.0)
 				continue;
-			if (isFirst || fabsf(thisDistance) < fabsf(repDistance) || (thisDistance < 0.0f && repDistance > 0.0f)) {
+			if (isFirst || GrowlCGFloatAbsoluteValue(thisDistance) < GrowlCGFloatAbsoluteValue(repDistance) || (thisDistance < 0.0 && repDistance > 0.0)) {
 				isFirst = NO;
 				repDistance = thisDistance;
 				bestRep = thisRep;

mozilla/camino/growl/Core/Source/GrowlPathwayController.h

@@ -1,60 +0,0 @@
-//
-//	GrowlPathwayController.m
-//	Growl
-//
-//	Created by Mac-arena the Bored Zo on 2005-08-08.
-//	Copyright 2005 The Growl Project. All rights reserved.
-//
-//	This file is under the BSD License, refer to License.txt for details
-
-@class GrowlPlugin;
-
-@protocol GrowlPathwayPlugin <NSObject>
-
-- (NSArray *) pathways;
-
-@end
-
-@class GrowlPathway, GrowlUDPPathway, GrowlTCPPathway;
-
-extern NSString *GrowlPathwayControllerWillInstallPathwayNotification;
-extern NSString *GrowlPathwayControllerDidInstallPathwayNotification;
-extern NSString *GrowlPathwayControllerWillRemovePathwayNotification;
-extern NSString *GrowlPathwayControllerDidRemovePathwayNotification;
-
-//userInfo keys.
-extern NSString *GrowlPathwayControllerNotificationKey;
-extern NSString *GrowlPathwayNotificationKey;
-
-@interface GrowlPathwayController : NSObject {
-	NSMutableSet *pathways;
-	NSMutableSet *remotePathways;
-
-	unsigned reserved: 31;
-	unsigned serverEnabled: 1;
-}
-
-+ (GrowlPathwayController *) sharedController;
-
-#pragma mark Installing and removing pathways
-
-- (void) installPathway:(GrowlPathway *)newPathway;
-- (void) removePathway:(GrowlPathway *)newPathway;
-
-#pragma mark Network control
-
-- (BOOL) isServerEnabled;
-- (void) setServerEnabled:(BOOL)enabled;
-
-#pragma mark Eating plug-ins
-
-//XXX make GrowlPathwayController a plug-in handler
-
-- (BOOL) loadPathwaysFromPlugin:(GrowlPlugin <GrowlPathwayPlugin> *)plugin;
-
-@end
-
-@interface GrowlPathwayController (Private_ForApplicationControllerOnly)
-- (void)setServerEnabledFromPreferences;
-@end
-

mozilla/camino/growl/Core/Source/GrowlPreferencesController.h

@@ -1,126 +0,0 @@
-//
-//  GrowlPreferencesController.h
-//  Growl
-//
-//  Created by Nelson Elhage on 8/24/04.
-//  Renamed from GrowlPreferences.h by Mac-arena the Bored Zo on 2005-06-27.
-//  Copyright 2004-2006 The Growl Project. All rights reserved.
-//
-// This file is under the BSD License, refer to License.txt for details
-
-#ifndef GROWL_PREFERENCES_CONTROLLER_H
-#define GROWL_PREFERENCES_CONTROLLER_H
-
-#ifdef __OBJC__
-#define XSTR(x) (@x)
-#else
-#define XSTR CFSTR
-#endif
-
-#define GrowlPreferencesChanged		XSTR("GrowlPreferencesChanged")
-#define GrowlPreview				XSTR("GrowlPreview")
-#define GrowlDisplayPluginKey		XSTR("GrowlDisplayPluginName")
-#define GrowlUserDefaultsKey		XSTR("GrowlUserDefaults")
-#define GrowlStartServerKey			XSTR("GrowlStartServer")
-#define GrowlRemoteRegistrationKey	XSTR("GrowlRemoteRegistration")
-#define GrowlEnableForwardKey		XSTR("GrowlEnableForward")
-#define GrowlForwardDestinationsKey	XSTR("GrowlForwardDestinations")
-#define GrowlUDPPortKey				XSTR("GrowlUDPPort")
-#define GrowlTCPPortKey				XSTR("GrowlTCPPort")
-#define GrowlUpdateCheckKey			XSTR("GrowlUpdateCheck")
-#define LastUpdateCheckKey			XSTR("LastUpdateCheck")
-#define	GrowlLoggingEnabledKey		XSTR("GrowlLoggingEnabled")
-#define	GrowlLogTypeKey				XSTR("GrowlLogType")
-#define	GrowlCustomHistKey1			XSTR("Custom log history 1")
-#define	GrowlCustomHistKey2			XSTR("Custom log history 2")
-#define	GrowlCustomHistKey3			XSTR("Custom log history 3")
-#define GrowlMenuExtraKey			XSTR("GrowlMenuExtra")
-#define GrowlSquelchModeKey			XSTR("GrowlSquelchMode")
-#define LastKnownVersionKey			XSTR("LastKnownVersion")
-#define GrowlStickyWhenAwayKey		XSTR("StickyWhenAway")
-#define GrowlStickyIdleThresholdKey	XSTR("IdleThreshold")
-
-CFTypeRef GrowlPreferencesController_objectForKey(CFTypeRef key);
-int       GrowlPreferencesController_integerForKey(CFTypeRef key);
-Boolean   GrowlPreferencesController_boolForKey(CFTypeRef key);
-
-#ifdef __OBJC__
-
-#import "GrowlAbstractSingletonObject.h"
-
-@interface GrowlPreferencesController : GrowlAbstractSingletonObject {
-}
-
-+ (GrowlPreferencesController *) sharedController;
-
-- (void) registerDefaults:(NSDictionary *)inDefaults;
-- (id) objectForKey:(NSString *)key;
-- (void) setObject:(id)object forKey:(NSString *)key;
-- (BOOL) boolForKey:(NSString*) key;
-- (void) setBool:(BOOL)value forKey:(NSString *)key;
-- (int) integerForKey:(NSString *)key;
-- (void) setInteger:(int)value forKey:(NSString *)key;
-- (void) synchronize;
-
-- (BOOL) shouldStartGrowlAtLogin;
-- (void) setShouldStartGrowlAtLogin:(BOOL)flag;
-- (void) setStartAtLogin:(NSString *)path enabled:(BOOL)flag;
-
-- (BOOL) isRunning:(NSString *)theBundleIdentifier;
-- (BOOL) isGrowlRunning;
-- (void) setGrowlRunning:(BOOL)flag noMatterWhat:(BOOL)nmw;
-- (void) launchGrowl:(BOOL)noMatterWhat;
-- (void) terminateGrowl;
-
-#pragma mark GrowlMenu running state
-
-- (void) enableGrowlMenu;
-- (void) disableGrowlMenu;
-
-#pragma mark -
-//Simplified accessors
-
-#pragma mark UI
-
-- (BOOL) isBackgroundUpdateCheckEnabled;
-- (void) setIsBackgroundUpdateCheckEnabled:(BOOL)flag;
-
-- (NSString *) defaultDisplayPluginName;
-- (void) setDefaultDisplayPluginName:(NSString *)name;
-
-- (BOOL) squelchMode;
-- (void) setSquelchMode:(BOOL)flag;
-
-- (BOOL) stickyWhenAway;
-- (void) setStickyWhenAway:(BOOL)flag;
-
-- (NSNumber*) idleThreshold;
-- (void) setIdleThreshold:(NSNumber*)value;
-
-#pragma mark GrowlMenu methods
-
-- (BOOL) isGrowlMenuEnabled;
-- (void) setGrowlMenuEnabled:(BOOL)state;
-
-#pragma mark "Network" tab pane
-
-- (BOOL) isGrowlServerEnabled;
-- (void) setGrowlServerEnabled:(BOOL)enabled;
-
-- (BOOL) isRemoteRegistrationAllowed;
-- (void) setRemoteRegistrationAllowed:(BOOL)flag;
-
-- (BOOL) isForwardingEnabled;
-- (void) setForwardingEnabled:(BOOL)enabled;
-
-- (NSString *) remotePassword;
-- (void) setRemotePassword:(NSString *)value;
-
-- (int) UDPPort;
-- (void) setUDPPort:(int)value;
-
-@end
-
-#endif
-
-#endif

mozilla/camino/growl/Core/Source/GrowlTicketController.h

@@ -1,29 +0,0 @@
-//
-//  GrowlTicketController.h
-//  Growl
-//
-//  Created by Mac-arena the Bored Zo on 2005-06-08.
-//  Copyright 2005-2006 Mac-arena the Bored Zo. All rights reserved.
-//
-
-#import "GrowlAbstractSingletonObject.h"
-
-#define GROWL_PATHEXTENSION_TICKET	@"growlTicket"
-
-@class GrowlApplicationTicket;
-
-@interface GrowlTicketController: GrowlAbstractSingletonObject
-{
-	NSMutableDictionary *ticketsByApplicationName;
-}
-
-+ (id) sharedController;
-
-- (NSDictionary *) allSavedTickets;
-
-- (GrowlApplicationTicket *) ticketForApplicationName:(NSString *) appName;
-- (void) addTicket:(GrowlApplicationTicket *) newTicket;
-- (void) removeTicketForApplicationName:(NSString *)appName;
-
-- (void) loadAllSavedTickets;
-@end

mozilla/camino/growl/Framework/Resources/Growl.framework-Info.plist

@@ -13,11 +13,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.4</string>
+	<string>GROWL_VERSION</string>
 	<key>CFBundleSignature</key>
 	<string>GRRR</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.4</string>
+	<string>GROWL_VERSION</string>
 	<key>NSPrincipalClass</key>
 	<string>GrowlApplicationBridge</string>
 </dict>

mozilla/camino/growl/Framework/Source/GrowlApplicationBridge-Carbon.c

@@ -113,9 +113,13 @@ Boolean Growl_SetDelegate(struct Growl_Delegate *newDelegate) {
 		delegate = newDelegate;
 	}
 
-	CFStringRef appName = delegate->applicationName;
-	if ((!appName) && (delegate->registrationDictionary))
-		appName = CFDictionaryGetValue(delegate->registrationDictionary, GROWL_APP_NAME);
+	CFStringRef appName = nil;
+	if(delegate) {
+		appName = delegate->applicationName;
+		if ((!appName) && (delegate->registrationDictionary))
+			appName = CFDictionaryGetValue(delegate->registrationDictionary, GROWL_APP_NAME);
+	}
+	
 	if (!appName) {
 		NSLog(CFSTR("%@"), CFSTR("GrowlApplicationBridge: Growl_SetDelegate called, but no application name was found in the delegate"));
 		return false;
@@ -260,8 +264,8 @@ void Growl_PostNotificationWithDictionary(CFDictionaryRef userInfo) {
 		                                     userInfo,
 		                                     /*deliverImmediately*/ false);
 #endif
-#ifdef GROWL_WITH_INSTALLER
 		CFRelease(userInfo);
+#ifdef GROWL_WITH_INSTALLER
 	} else {
 		/*if Growl launches, and the user hasn't already said NO to installing
 		 *	it, store this notification for posting
@@ -276,9 +280,11 @@ void Growl_PostNotificationWithDictionary(CFDictionaryRef userInfo) {
 
 			//if we have not already asked the user to install Growl, do it now
 			if (!promptedToInstallGrowl) {
+#ifndef __LP64__
 				OSStatus err = _Growl_ShowInstallationPrompt();
 				promptedToInstallGrowl = (err == noErr);
 				//_Growl_ShowInstallationPrompt prints its own errors.
+#endif
 			}
 
 			CFRelease(userInfo);
@@ -967,6 +973,11 @@ static CFBundleRef _copyGrowlPrefPaneBundle(void) {
 			if (bundleIdentifier && (CFStringCompare(bundleIdentifier, GROWL_PREFPANE_BUNDLE_IDENTIFIER, bundleIDComparisonFlags) == kCFCompareEqualTo)) {
 				growlPrefPaneBundle = prefPaneBundle;
 			}
+			else {
+				CFRelease(prefPaneBundle);
+				prefPaneBundle = nil;
+			}
+
 		}
 
 		if (!growlPrefPaneBundle) {
@@ -978,6 +989,11 @@ static CFBundleRef _copyGrowlPrefPaneBundle(void) {
 				if (bundleIdentifier && (CFStringCompare(bundleIdentifier, GROWL_PREFPANE_BUNDLE_IDENTIFIER, bundleIDComparisonFlags) == kCFCompareEqualTo)) {
 					growlPrefPaneBundle = prefPaneBundle;
 				}
+				else {
+					CFRelease(prefPaneBundle);
+					prefPaneBundle = nil;
+				}
+
 			}
 
 			if (!growlPrefPaneBundle) {
@@ -989,6 +1005,11 @@ static CFBundleRef _copyGrowlPrefPaneBundle(void) {
 					if (bundleIdentifier && (CFStringCompare(bundleIdentifier, GROWL_PREFPANE_BUNDLE_IDENTIFIER, bundleIDComparisonFlags) == kCFCompareEqualTo)) {
 						growlPrefPaneBundle = prefPaneBundle;
 					}
+					else {
+						CFRelease(prefPaneBundle);
+						prefPaneBundle = nil;
+					}
+
 				}
 			}
 		}
@@ -1072,8 +1093,12 @@ static void _checkForPackagedUpdateForGrowlPrefPaneBundle(CFBundleRef growlPrefP
 
 						if (!installedVersion) {
 							NSLog(CFSTR("GrowlApplicationBridge: no installed version (description of installed prefpane's Info.plist follows)\n%@"), installedInfoDict);
+#ifdef __LP64__
+							NSLog(CFSTR("GrowlApplicationBridge: Growl prompt suppressed because this is a 64-bit application using the Carbon application bridge instead of the Cocoa bridge. Since Carbon doesn't work in 64-bit applications, please contact the application developer and ask them to switch to the Cocoa-based Growl API."));
+#else
 							_Growl_ShowInstallationPrompt();
 							//_Growl_ShowInstallationPrompt prints its own errors
+#endif
 						} else {
 							Boolean upgradeIsAvailable = (compareVersionStringsTranslating1_0To0_5(ourVersion, installedVersion) == kCFCompareGreaterThan);
 
@@ -1084,9 +1109,11 @@ static void _checkForPackagedUpdateForGrowlPrefPaneBundle(CFBundleRef growlPrefP
 								if (!lastDoNotPromptVersion ||
 									(compareVersionStringsTranslating1_0To0_5(ourVersion, lastDoNotPromptVersion) == kCFCompareGreaterThan))
 								{
+#ifndef __LP64__
 									OSStatus err = _Growl_ShowUpdatePromptForVersion(ourVersion);
 									promptedToUpgradeGrowl = (err == noErr);
 									//_Growl_ShowUpdatePromptForVersion prints its own errors
+#endif
 								}
 
 								if (lastDoNotPromptVersion)

mozilla/camino/growl/Framework/Source/GrowlApplicationBridge-Carbon.h

@@ -15,7 +15,7 @@
 #include <Carbon/Carbon.h>
 
 #ifndef GROWL_EXPORT
-#define GROWL_EXPORT __attribute__((visibility("default")))
+#define GROWL_EXPORT __attribute__((visibility("default"))) DEPRECATED_ATTRIBUTE
 #endif
 
 /*!	@header GrowlApplicationBridge-Carbon.h

mozilla/camino/growl/Framework/Source/GrowlApplicationBridge.h

@@ -165,40 +165,6 @@
 			clickContext:(id)clickContext
 			  identifier:(NSString *)identifier;
 
-/*!
- *	@method notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:identifier:
- *	@abstract Send a Growl notification.
- *	@discussion This is the preferred means for sending a Growl notification.
- *	 The notification name and at least one of the title and description are
- *	 required (all three are preferred).  All other parameters may be
- *	 <code>nil</code> (or 0 or NO as appropriate) to accept default values.
- *
- *	 If using the Growl-WithInstaller framework, if Growl is not installed the
- *	 user will be prompted to install Growl. If the user cancels, this method
- *	 will have no effect until the next application session, at which time when
- *	 it is called the user will be prompted again. The user is also given the
- *	 option to not be prompted again.  If the user does choose to install Growl,
- *	 the requested notification will be displayed once Growl is installed and
- *	 running.
- *
- *	@param title		The title of the notification displayed to the user.
- *	@param description	The full description of the notification displayed to the user.
- *	@param notifName	The internal name of the notification. Should be human-readable, as it will be displayed in the Growl preference pane.
- *	@param iconData		<code>NSData</code> object to show with the notification as its icon. If <code>nil</code>, the application's icon will be used instead.
- *	@param priority		The priority of the notification. The default value is 0; positive values are higher priority and negative values are lower priority. Not all Growl displays support priority.
- *	@param isSticky		If YES, the notification will remain on screen until clicked. Not all Growl displays support sticky notifications.
- *	@param clickContext	A context passed back to the Growl delegate if it implements -(void)growlNotificationWasClicked: and the notification is clicked. Not all display plugins support clicking. The clickContext must be plist-encodable (completely of <code>NSString</code>, <code>NSArray</code>, <code>NSNumber</code>, <code>NSDictionary</code>, and <code>NSData</code> types).
- *	@param identifier	An identifier for this notification. Notifications with equal identifiers are coalesced.
- */
-+ (void) notifyWithTitle:(NSString *)title
-			 description:(NSString *)description
-		notificationName:(NSString *)notifName
-				iconData:(NSData *)iconData
-				priority:(signed int)priority
-				isSticky:(BOOL)isSticky
-			clickContext:(id)clickContext
-			  identifier:(NSString *)identifier;
-
 /*!	@method	notifyWithDictionary:
  *	@abstract	Notifies using a userInfo dictionary suitable for passing to
  *	 <code>NSDistributedNotificationCenter</code>.

mozilla/camino/growl/Framework/Source/GrowlApplicationBridge.m

@@ -563,13 +563,13 @@ static BOOL		registerWhenGrowlIsReady = NO;
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	[delegate growlNotificationWasClicked:
 		[[notification userInfo] objectForKey:GROWL_KEY_CLICKED_CONTEXT]];
-	[pool release];
+	[pool drain];
 }
 + (void) growlNotificationTimedOut:(NSNotification *)notification {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	[delegate growlNotificationTimedOut:
 		[[notification userInfo] objectForKey:GROWL_KEY_CLICKED_CONTEXT]];
-	[pool release];
+	[pool drain];
 }
 
 #pragma mark -
@@ -671,7 +671,7 @@ static BOOL		registerWhenGrowlIsReady = NO;
 	[queuedGrowlNotifications release]; queuedGrowlNotifications = nil;
 #endif
 	
-	[pool release];
+	[pool drain];
 }
 
 #ifdef GROWL_WITH_INSTALLER
@@ -725,31 +725,57 @@ static BOOL		registerWhenGrowlIsReady = NO;
 #pragma mark -
 
 + (BOOL) _launchGrowlIfInstalledWithRegistrationDictionary:(NSDictionary *)regDict {
-	NSBundle		*growlPrefPaneBundle;
-	BOOL			success = NO;
+	BOOL success = NO;
+	NSBundle *growlPrefPaneBundle;
+	NSString *growlHelperAppPath;
 
+#ifdef DEBUG
+	//For a debug build, first look for a running GHA. It might not actually be within a Growl prefpane bundle.
+	growlHelperAppPath = [[GrowlPathUtilities runningHelperAppBundle] bundlePath];
+	if (!growlHelperAppPath) {
+		growlPrefPaneBundle = [GrowlPathUtilities growlPrefPaneBundle];
+		growlHelperAppPath = [growlPrefPaneBundle pathForResource:@"GrowlHelperApp"
+														   ofType:@"app"];
+	}
+	NSLog(@"Will use GrowlHelperApp at %@", growlHelperAppPath);
+#else
 	growlPrefPaneBundle = [GrowlPathUtilities growlPrefPaneBundle];
-
-	if (growlPrefPaneBundle) {
-		NSString *growlHelperAppPath = [growlPrefPaneBundle pathForResource:@"GrowlHelperApp"
-																	 ofType:@"app"];
+	growlHelperAppPath = [growlPrefPaneBundle pathForResource:@"GrowlHelperApp"
+													   ofType:@"app"];
+#endif
 
 #ifdef GROWL_WITH_INSTALLER
+	if (growlPrefPaneBundle) {
 		/* Check against our current version number and ensure the installed Growl pane is the same or later */
 		[self _checkForPackagedUpdateForGrowlPrefPaneBundle:growlPrefPaneBundle];
+	}
 #endif
-		//Houston, we are go for launch.
-		if (growlHelperAppPath) {
-			//Let's launch in the background (unfortunately, requires Carbon on Jaguar)
-			LSLaunchFSRefSpec spec;
-			FSRef appRef;
-			OSStatus status = FSPathMakeRef((UInt8 *)[growlHelperAppPath fileSystemRepresentation], &appRef, NULL);
-			if (status == noErr) {
-				FSRef regItemRef;
+
+	//Houston, we are go for launch.
+	if (growlHelperAppPath) {
+		//Let's launch in the background (requires sending the Apple Event ourselves, as LS may activate the application anyway if it's already running)
+		NSURL *appURL = [NSURL fileURLWithPath:growlHelperAppPath];
+		if (appURL) {
+			OSStatus err;
+
+			//Find the PSN for GrowlHelperApp. (We'll need this later.)
+			struct ProcessSerialNumber appPSN = {
+				0, kNoProcess
+			};
+			while ((err = GetNextProcess(&appPSN)) == noErr) {
+				NSDictionary *dict = [(id)ProcessInformationCopyDictionary(&appPSN, kProcessDictionaryIncludeAllInformationMask) autorelease];
+				NSString *bundlePath = [dict objectForKey:@"BundlePath"];
+				if ([bundlePath isEqualToString:growlHelperAppPath]) {
+					//Match!
+					break;
+				}
+			}
+
+			if (err == noErr) {
+				NSURL *regItemURL = nil;
 				BOOL passRegDict = NO;
 
 				if (regDict) {
-					OSStatus regStatus;
 					NSString *regDictFileName;
 					NSString *regDictPath;
 
@@ -782,20 +808,41 @@ static BOOL		registerWhenGrowlIsReady = NO;
 						[error release];
 					}
 
-					regStatus = FSPathMakeRef((UInt8 *)[regDictPath fileSystemRepresentation], &regItemRef, NULL);
-					if (regStatus == noErr)
+					if ([[NSFileManager defaultManager] fileExistsAtPath:regDictPath]) {
+						regItemURL = [NSURL fileURLWithPath:regDictPath];
 						passRegDict = YES;
+					}
 				}
 
-				spec.appRef = &appRef;
-				spec.numDocs = (passRegDict != NO);
-				spec.itemRefs = (passRegDict ? &regItemRef : NULL);
-				spec.passThruParams = NULL;
-				spec.launchFlags = kLSLaunchDontAddToRecents | kLSLaunchDontSwitch | kLSLaunchNoParams | kLSLaunchAsync;
-				spec.asyncRefCon = NULL;
-				status = LSOpenFromRefSpec(&spec, NULL);
+				AEStreamRef stream = AEStreamCreateEvent(kCoreEventClass, kAEOpenDocuments,
+					//Target application
+					typeProcessSerialNumber, &appPSN, sizeof(appPSN),
+					kAutoGenerateReturnID, kAnyTransactionID);
+				if (!stream) {
+					NSLog(@"%@: Could not create open-document event to register this application with Growl", [self class]);
+				} else {
+					if (passRegDict) {
+						NSString *regItemURLString = [regItemURL absoluteString];
+						NSData *regItemURLUTF8Data = [regItemURLString dataUsingEncoding:NSUTF8StringEncoding];
+						err = AEStreamWriteKeyDesc(stream, keyDirectObject, typeFileURL, [regItemURLUTF8Data bytes], [regItemURLUTF8Data length]);
+						if (err != noErr) {
+							NSLog(@"%@: Could not set direct object of open-document event to register this application with Growl because AEStreamWriteKeyDesc returned %li/%s", [self class], (long)err, GetMacOSStatusCommentString(err));
+						}
+					}
 
-				success = (status == noErr);
+					AppleEvent event;
+					err = AEStreamClose(stream, &event);
+					if (err != noErr) {
+						NSLog(@"%@: Could not finish open-document event to register this application with Growl because AEStreamClose returned %li/%s", [self class], (long)err, GetMacOSStatusCommentString(err));
+					} else {
+						err = AESendMessage(&event, /*reply*/ NULL, kAENoReply | kAEDontReconnect | kAENeverInteract | kAEDontRecord, kAEDefaultTimeout);
+						if (err != noErr) {
+							NSLog(@"%@: Could not send open-document event to register this application with Growl because AESend returned %li/%s", [self class], (long)err, GetMacOSStatusCommentString(err));
+						}
+					}
+					
+					success = (err == noErr);
+				}
 			}
 		}
 	}

mozilla/camino/growl/Framework/Source/GrowlInstallationPrompt-Carbon.h

@@ -25,6 +25,7 @@
 #ifndef HAVE_GROWLINSTALLATIONPROMPT_H
 #define HAVE_GROWLINSTALLATIONPROMPT_H
 
+#ifndef __LP64__
 #include <Carbon/Carbon.h>
 
 /*!	@function _Growl_ShowInstallationPrompt
@@ -39,4 +40,5 @@ OSStatus _Growl_ShowInstallationPrompt(void);
  */
 OSStatus _Growl_ShowUpdatePromptForVersion(CFStringRef updateVersion);
 
-#endif
+#endif	// __LP64__
+#endif	// HAVE_GROWLINSTALLATIONPROMPT_H

mozilla/camino/growl/GrowlVersion.h

@@ -0,0 +1,8 @@
+#define COMMENT_1 DO NOT EDIT THE VERSION IN THIS FILE! Change the version in Release/Makefile instead, then run make version while in the Release directory.
+#define COMMENT_2 In case you're wondering why we're using #define for comments: This header is #imported into both Objective-C code and XML Info.plist files.
+
+#define GROWL_VERSION 1.2
+#define GROWL_VERSION_STRING "1.2"
+
+#undef COMMENT_1
+#undef COMMENT_2

mozilla/camino/growl/Info.plist-Prefix.pch

@@ -0,0 +1 @@
+#import "GrowlVersion.h"

mozilla/camino/growl/License.txt

@@ -1,10 +1,8 @@
-Copyright (c) The Growl Project, 2004-2008
+Copyright (c) The Growl Project, 2004-2009
 All rights reserved.
 
-
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-
 1. Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
@@ -14,5 +12,4 @@ Redistribution and use in source and binary forms, with or without modification,
    may be used to endorse or promote products derived from this software
    without specific prior written permission.
 
-
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

mozilla/camino/growl/README

@@ -3,8 +3,14 @@ notifications to users.  See http://www.growl.info/ for more information about
 Growl. The Growl framework is shipped inside Camino's bundle, and some glue
 code is included in Camino itself.
 
-This is Growl 1.1.4 (4886) from http://www.growl.info/files/source/Growl-1.1.4-src.tar.bz2
+This is Growl 1.2+ (4461:fac59330ff0c) from http://growl.info/hg/growl-development/archive/fac59330ff0c.zip
 with the following changes:
 - Only the source files needed to build the "Growl.framework" target have been included.
-- Commented out the SDK declarations in Growl.xcodeproj to support mozconfig-based configurations.
-- Debug symbol format for Deployment was changed to DWARF+dSYM for better breakpad symbol generation, and the incompatible save-repository disabled.
+- Made the following changes to Growl.xcodeproj:
+  - Converted to Xcode 3.0 format to make it more compatible with Xcode 2.5 toolchain on 10.4.
+  - Commented out the SDK declarations to support mozconfig-based configurations.
+  - Commented out any Xcode 3.1-style [arch=<foo>] notation and supplied non-arch-specific values where appropriate.
+  - Supplied valid archs for building with toolchains on Mac OS X 10.4 and 10.5.
+  - Set the MACOSX_DEPLOYMENT_TARGET to 10.4 in all configurations.
+  - Changed the default build configuration to Release.
+  - Disabled the incompatible save-repository setting to prevent bustage when building on 10.4.

mozilla/camino/growl/generateHgRevision.sh

@@ -0,0 +1,21 @@
+#We do this so that people who launch Xcode from the UI will be able to run
+#hg.  If we come across any other paths here where people would install
+#hg by default, we should add them here.
+PATH="$PATH:/opt/local/bin:/usr/local/bin:/sw/bin"
+
+#this is done because the mercurial source install seems to put it in this location
+export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.6/site-packages"
+
+#this is done because Xcode won't actually run the script if the output file already exists, which is bad
+HEADERPATH="$TARGET_BUILD_DIR/include/hgRevision.h"
+
+#hg parent will present two revisions if the user has a pending merge.
+#The user probably shouldn't be building in such a circumstance, but,
+#nonetheless, we should handle it sanely. We do this by only showing the
+#first parent.
+REVISION=`hg parent --template="{rev}\n" | head -n1`
+echo "*** Building Growl Revision: $REVISION"
+mkdir -p "`dirname "$HEADERPATH"`"
+
+echo "#define HG_REVISION $REVISION" > "$HEADERPATH"
+echo "#define HG_REVISION_STRING \"$REVISION\"" >> "$HEADERPATH"

mozilla/camino/growl/generateSVNRevision.sh

@@ -1,10 +0,0 @@
-#We do this so that people who launch Xcode from the UI will be able to run
-#svnversion.  If we come across any other paths here where people would install
-#svn by default, we should add them here.
-PATH="$PATH:/opt/local/bin:/usr/local/bin:/usr/local/subversion/bin:/sw/bin"
-REVISION=`svnversion .`
-echo "*** Building Growl Revision: $REVISION"
-mkdir -p `dirname $SCRIPT_OUTPUT_FILE_0`
-#SVN_REVISION is a string because it may look like "4168M" or "4123:4168MS"
-echo "#define SVN_REVISION \"$REVISION\"" > $SCRIPT_OUTPUT_FILE_0
-echo "#define SVN_REVISION_STRING $REVISION" >> $SCRIPT_OUTPUT_FILE_0

mozilla/camino/installer/Makefile.in

@@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
-CAMINO_VERSION=2.0b3
+CAMINO_VERSION=2.0.3
 _RELNOTE_VERSION:=$(subst .,-,$(CAMINO_VERSION))
 
 # The packager runs in the dist directory, paths must be relative to there.

mozilla/camino/makefiles.sh

@@ -44,6 +44,7 @@ camino/flashblock/Makefile
 camino/idl/Makefile
 camino/installer/Makefile
 camino/pinstripe/Makefile
+camino/places/Makefile
 camino/striptease/Makefile
 camino/safebrowsing/Makefile
 "

mozilla/camino/places/Makefile.in

@@ -0,0 +1,72 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is just a lowly Makefile.
+#
+# The Initial Developer of the Original Code is Google Inc.
+# Portions created by the Initial Developer are Copyright (C) 2007
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Mark Mentovai <mark@moxienet.com> (Original Author)
+#  Smokey Ardisson <alqahira@ardisson.org>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+
+# The presence of jar.mn causes $(SOURCE_CHROME_DIR)/$(JAR_FILE).jar to be
+# built and $(SOURCE_CHROME_DIR)/installed-chrome.txt to be updated.  Camino
+# uses $(TARGET_CHROME_DIR)/installed-chrome.txt instead, though, so copy
+# the jar and update the correct installed-chrome.txt file.  For locales, it is
+# necessary to supply the locale as well as the package name, since 
+# add-chrome.pl does not do the right thing when manully updating the
+# $(TARGET_CHROME_DIR)/installed-chrome.txt file. Each locale must also have a
+# corresponding content package registered, so repeat the manual registration
+# for content, too.
+
+SOURCE_CHROME_DIR   = $(DIST)/bin/chrome
+TARGET_CHROME_DIR   = $(DIST)/Embed/chrome
+INSTALLED_CHROME    = $(TARGET_CHROME_DIR)/installed-chrome.txt
+CHROME_TYPE         = locale
+CHROME_TYPE_2       = content
+CHROME_PKG_NAME     = places
+JAR_FILE            = embed
+
+libs realchrome:: $(CHROME_DEPS)
+	chmod a-x $(INSTALLED_CHROME)
+	$(NSINSTALL) -t -m 0644 \
+	  $(SOURCE_CHROME_DIR)/$(JAR_FILE).jar $(TARGET_CHROME_DIR)
+	$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl \
+	  $(INSTALLED_CHROME) 0 $(CHROME_TYPE) en-US/$(CHROME_PKG_NAME) $(JAR_FILE)
+	$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl \
+	  $(INSTALLED_CHROME) 0 $(CHROME_TYPE_2) $(CHROME_PKG_NAME) $(JAR_FILE)

mozilla/camino/places/content/contents.rdf

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:communicator"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:places"
+        chrome:displayName="Places"
+        chrome:author="mozilla.org"
+        chrome:name="places"
+        chrome:localeVersion="1.9a1"
+        chrome:skinVersion="1.8">
+  </RDF:Description>
+
+</RDF:RDF>
+

mozilla/camino/places/jar.mn

@@ -0,0 +1,12 @@
+# The aim is to be able to access chrome://places/locale/places.properties
+
+embed.jar:
+  locale/en-US/places/places.properties  (/toolkit/locales/en-US/chrome/places/places.properties)
+  locale/en-US/places/contents.rdf       (locale/contents.rdf)
+# Places is bizarre, because toolkit/ Places has no content, but it has the 
+# above silly locale file.  All the content chrome lives in individal XUL 
+# applications, along with a forked copy of the silly locale file. However, 
+# locale packages don't work unless there is a corresponding content package,
+# and only Camino doesn't have app-specific content chrome package to hide this
+# bizarreness. Fake a dummy content package to get the locale package to work.
+  content/places/contents.rdf            (content/contents.rdf)