From ccd4b6d15d64d90445eec09a9d76af56236eb85e Mon Sep 17 00:00:00 2001
From: "hyatt%netscape.com"
 <hyatt%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 28 Apr 2002 21:59:30 +0000
Subject: [PATCH] adding an import bookmarks menu command.

git-svn-id: svn://10.0.0.236/trunk@120148 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../English.lproj/MainMenu.nib/objects.nib    | Bin 9208 -> 9364 bytes
 mozilla/camino/MainController.mm              |   3 ++-
 mozilla/camino/MainMenu.nib/classes.nib       |   1 +
 mozilla/camino/MainMenu.nib/objects.nib       | Bin 9208 -> 9364 bytes
 .../English.lproj/MainMenu.nib/classes.nib    |   1 +
 .../English.lproj/MainMenu.nib/objects.nib    | Bin 9208 -> 9364 bytes
 .../camino/src/application/MainController.mm  |   3 ++-
 .../English.lproj/MainMenu.nib/classes.nib    |   1 +
 .../English.lproj/MainMenu.nib/objects.nib    | Bin 9208 -> 9364 bytes
 mozilla/chimera/MainController.mm             |   3 ++-
 mozilla/chimera/MainMenu.nib/classes.nib      |   1 +
 mozilla/chimera/MainMenu.nib/objects.nib      | Bin 9208 -> 9364 bytes
 .../English.lproj/MainMenu.nib/classes.nib    |   1 +
 .../English.lproj/MainMenu.nib/objects.nib    | Bin 9208 -> 9364 bytes
 .../chimera/src/application/MainController.mm |   3 ++-
 15 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/mozilla/camino/English.lproj/MainMenu.nib/objects.nib b/mozilla/camino/English.lproj/MainMenu.nib/objects.nib
index 297a662ebbeb4824b8bdceba0b635e52602bc949..8813d564eb4548c6a45b54d0cb4dde73daf40f98 100644
GIT binary patch
literal 9364
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

literal 9208
zcmb_h4QyOhcD~nt@qg?XlFeFahQc-*qD?mhmLw1}j!A+cc8rHC>}JDiJo9WnGBeMa
z8OJz9U9NfaTCt_O>rHNn*N8N*+p;8Sq)1UgMB1N9SC&#CfrJDSsHmIb?P_VERotfD
zq~E!B-kY%<k6m?x@OyLq&$;KGd+vD^b=lD&E1t=wt!Pq|PrE$qx^824q;uE)zNf5M
z_Q7a2D%d}{ZgqFWKv-_vkaP@ZvQE+fHy(G(!o<3=JJL0rjrJw1NH%S!2Ds+TzaMw`
zriSiF`_NFrjzzP!lk#$&%WX@7vlg6IYPd6NB?bTQ<D{g@fCRgI+^w*~;qchAj4}7*
z$%@@^JL?%U^6J{t>F6kP-4&3pUyo1Jj=Mh^pL83*+1W|#;T?8ZvmZ#s9S?H&F>j1D
zF*f#{8#ivS90WFXM~q*+R>m1l$E=OVB?uw4GZ`JQh>2W;p&f%(>~J!gKJ0lp_b2ji
zfB`dMy6mT|cqALmT0kLO_|Ma(oErO?v7dQoiuL|D_u5=KGP1m57%sxbr{~ysQ`(9S
zXJ}Lt$Cf6p?1^Sz8i_u-DD{Lfm<*|nSP5i8s6CO;OwmP|DBQ-!GfVroa*v&ghwN0S
z2XWoJd9#+?Us|>{NAtB0MD3Jj8CZ-3xpj&dDmxNZG`(oVCne0zY0A3&Lslx(YsIWo
zb^*QHm>KR%VtLzRl({?f!n!ZL#M~E8&S7*<O>m0dFSX2Ctvy6}u|TB1=;X)hZ+AzG
z<_DeFF!W?In#c2?Bgp$bb^<GRYNDPLOc@2;)=21a#L^kj@klKej{?gIVtFjur|Gk$
z>2=DMTux&~y^bB(=dYzxS}-k5gJ#<2<ck3yJW-l!x#rYHqDQSzd&V~=^7|3nK*<`4
zSlQtrUvf`r$>e5r4@zOyXBaBYuv`!8A9vD+L;L&t6L!k-&iFN~s6Jo=P;ToSJ$bTh
zFG}92i7HBiX`MM04>`%3a~hf@Ecv7$X~iBVJrYgFDWS^$ZSuKN9!@W#LKyp6zC38-
zh)Iuz1{^CB8nn{Z#>Mwgez#ZbipCD-?HF6kj%hhr2uyVsN{QZU2v0RRHKW5*(;Yo(
z4@6<W0;Q*e&Hq2(sUx0Q&9kz-&l%2!7U%T0ykS`)!hzVvp0w2u_fs)TXLPCRI=hVc
z8e^*?R{E$7ktO^?aVwC)S4N>-iCX3J=8M$-(VvIxxK$J-+W3QuEmk4Ab((E|7MZZn
z=DCs8+b%NbjOb(Q_Y<$iM~Cg=wI!>MEM_&usUC5nX2&WDlF6+KUC8H~WzuTO8^20E
z=PAE#TO%bF=!;mC1|o0O30SXve#~(aeI?Gk0{tzf+p&*Xp*$0nsriN#$JXdst@Z43
z9NhwCeC8!M$HM4;N**RgdUGV}42AYN(KuR2-5^jn`R2ufUGS%_*Ghn`z>_Y`vs{bn
zcG&|1Ryy>U^|a~AHkFo3`BxuFMiYr*rmrl`R2NA)PIj=M=ui<4&lQz-<MeVJXrw&S
zVF`7n`c3z17l~#IMUxLr1-6LphxI~Oi!tKJ(XB3W_t*22$Yl4lkB9J@Ab%F*O`*c>
zM1q%-uWdTPztA2xs~gHXp@82%TjPrvRuItC6-`BPhzGoj>(*`8gV0|=?7Ox8weu1m
z4QvF(jCLEPXkRG<b}yqe8!gQpxR7O0BC%$BoJ8Eh8FZ5qzF^iZMGO&ZD4I6s)=hZ)
zC2Cv37@y9Rp{jg`dGkfhx4}LUBBt+Ny{05}B%F*@+@g+@3X)-3*=48fB$cJ2);75`
zU)?tyC+YLdH@3Kp^)BH)h1Qr-W9;|)<<ZhcEPbRKsny-6Bz_Z~@0nHwH_>_9JReAO
z0Y`0T7}eJF?qH)9rv%$_ty#5;F6(qw(ze=@c5ZS3@}oz2-iVXUER26kp?H~8sd&gr
z3@yH?=)Pn~kS6+~l+tO^7&J{GEr52@1B=C)l9TMHgB?NpX0Cf?HZXtbO+A?`G{i5S
ztksPK)wc{a#^vKj$%hebOw&V;b?pn8iWl0SN{lY>$8G-hkTY~(h~^cA8zCkL&E1h6
zLhKsOW}Q@rl}L!PEqbOxT>z157<<Qc>$@Wbst5FMBZ?@R_56e0+A&<Q?J>9gIvcBI
zjJXwI{G(|F1|)m1RJR_VxWlbHxb<tXLsh_k5&vJm!S=CX7GpMxvnbok()gRgy9IvU
z-{A5XJIBwla}{1L2l4sqtm|SvQ)E6yFM5Du%*1%52J;bUOgo8<T0MmiZ*_Ee%?vpy
zR4S%tH}K807Men^KOfIcj8&5L^<;g2{vQHgMx!1Gprdt<Z6)Gs1^csc!JeOB7jyXc
zyIb0t8Eb1M5Y1A?a~KB2VqwN%4-K3GMhezW!Jd6>tb!v}EX>$Xkt8+wyWoymPq49E
z?(cN>F4zlhc`O_zAsFv;I0*-)pR01qVIH`uBBL0SBq_`4W5#7o<GF(U@LaiD*5Ci!
z19$%Pb&f<NNYz_{9S3n!o|vpEX1K&a>A`ru1LGjUTm(MHnBe@Y=CAQ>JSVY1u&@+2
zo#I8I^}Kvcb~Xxj0qabE3vu~-gyb2|t;u9;J?;t%{{2VzSk+kg24tdjr$0GZ``pAG
zXO@#GXB&_qlqF!3M{{nu9k$1IVi89eJkck)*)O#{30$H~(=vbSy@GH*18VHqQ`Ay4
z=)Kk9B+(dS4pl_1+Z&&JM7}>IpXim1v-13;96`XO-7ER5{Cry8-6{urrPV84Nz=JT
zDgpVlM85?^C*+Zo1PfATnd6;8!y(v@bvZyW5bP(~<a$zYvmSRrLl$uOLygd`CHiom
zqp1hC8YdM^+)U4$?u?4xl)R@^ZfKQfC*}S&`RTO0y;Z(9B`ap-eKYc4uiU#^o}QFf
zXXNZP`Ku{;ZAM0W<sGfEszSa!CAYN7-5s)JR?eJ|eZBHfuY7p7d}m5d-zR%!WYerX
zHX=LP<kT8@eO9It@}nvFWUqXEQob=M@1H?nU!cIgJ0&kp$~E-+<q>&hO17?*wX<?l
ztL*KOA50YjkK0ZvUcAuSokGOvM9?INdnFZN!OrWruOO)3+m)OR`W!WSI!I?L?H#`8
zaIjcQgXZxMSIt+lkMwn|K7h8y3`a2#4D~zdknsYF7wwRX6}LoUD5Uzx4a8{mPkD=s
zhiU02<;PR9?S8qfRkB&RYF56v+!5xSh~IQ(DcC>g!2kcJmQ!+btNhKh47bS(lgN<g
zPslr4<>e{);gq~IDL<Q*b+fX3R(9={kL;GeotC$?%EXL3&@0!@$aSr9ee1-R<pkCc
zCxd@*-tEa5<Vs;+BQN78-|opny0powpfCE4;K?b${!yNuD`l%k<`5+=;aMxK3$1(~
zfU>*p^5hX>IY_^@Z1LpLxx9c}m<xgOHv!@Icrro8fMOEA^Pes}$?>Cn%Uu9p!duxr
zc=?d%py?xef={s1g1sW&Av_V%$%I3v=wJh}VCMiV3dX&jylBY$@ND_2CsTRZEkIRl
z!9P!)0H~hk4I46{{Ua&VM|lO<vh7;x%kyMt{VsrW8v##_09K=0gMFCFdGce@^fgbu
zF;4)buAvaV3wYUfh&zv$BD(=OJC|iEK*s=@vvMDh_-#01bX(+qQ?jx+t}AK!l*M7o
zJ8=x5W^5&@Te~COc3=J!z$1lk7EW5Qw{`DjPzKg~{4F~N@hhYFP?Q?5I#asg-9cAZ
z!T#f|j|kbA9!}A)cVBcA6TJX;gm5((43?-#4ZtlF<XR+C(oW&t7Qh=%z^~PVxFG6g
zv*^oLCZMS!no6PxKuwx$I7LA8<O|qb_ZIE#{^2an&|+r=`_H#dAfX_#I*#u)m|t4H
zUzZKMHf4>N-reZq<>*{alg9dFktUz(UBgx5;M)jgQDEc;c|-=2c8XMhxMC2ivd+Lj
z!pcvmyByy?qYsBOG}a}}9@HsC;rEfWKYgU$p!v1=*vPIOqKSGzt6`(GZc6$J^WC=Z
z$D4+;t{+EAr(W8?;PW{!R>trREdX60P}LB9DGOi|8Wy9kNdfF4!D=)53mH}_fM3en
zN!s+cssQr@Wl+nImBx9Iq+4z@JDkQvHy}7jBJ1-6be#<_VI#CY8jt(a3xhN6w}G!Q
z>0|O2Gn3K>NM=J`roPVxLe~>&J+eJN|MLfe`ul886!}#Yg5MYmRtz}w?I4hGM;;t^
zXmA&RHyChD+%Z$R0P&tdG*C|YjZ%Q*2DvtFXND5d(W23Jan@p=ev;QZ;LyxJ;Q!Qs
zYX_YCSBU`gq`}n0Xdr<*bbxp}F9|!N7;G7E{ZRhiU5x89xat&Ijbiw918<-bp+5%f
za-I(KoTXS-#ER<4X@XP^<Lg~Ow8=<V*{3Itbd87<r^jZ4ZpxV9;sX2@gKsvw&rB1E
zD3HH5FCeMsU_rVB_(u%B7FlLSPXVUOU>bl4W=sKc9eL7XwB}QZMrEmh;5Ng(+K>c#
z{aH2kX>LNWlWtkq7Q9{XKULcVe?kfVxZtPMr-IuG_*d1>1^3j<I(55X)4;A3{122R
z_@CgtOt8<CVAlluu6hF}CP146Kd6ohz7p>>f>+_O0!3bJ5&SRJJrE8+MDQOeoWZB?
zzF+Vk;IUh9p{5>H=LLHSKRX2f4g}8%Hm)jge^PydKclYiP_=@6U!|S`$$G*6P@NTg
z40Nx;0f4?C_$#Vhu<xl!!Cq6F1^)|Gg)1m1Q0W@+cv<ik^}gU~g`IUxT@k!e-6z;p
zb%LuSj{2?O1FB81>k3={hWbSCL5RIo@HKcez#%-~g9S-2|KIUzgWwP2(JFWdkFN;+
zEp<__GisgSFN5j@!Ryoo!CqGn3;tK2ctr5;;c>g*+ti5Q^=eH7KkpMfi^oRb6>ge8
zP}73Vs1JHnVnAK)RUdUJyHfp1@Cx<e!|IaYUs6vBei$4(1s_(g3+^iHVxjIA?04!j
z!Jkrff_Z9oyIL>UC!kv?c(Xe6Ep?~hUstf<MTNNUfPw#Y41ccDqIBW%su1^a6&3th
z03H=wDpc`*RvQHSR{;K4@IHmo^J~1f2)-JR?Sg0Uz`gh+9$ykXto90iLah?)1ORn{
zSF4Y^)m8Lc>IuQ`Rc{ME3d8}yCsj`i-X0MAm^vtUo4QT#zgA6xN!2RYzrd`|H>gd5
ze^>Q>L0#Jh(q_R|sdofFqM+{=3MunLK-UPq4#cPfFRB*IJro=vW3U3ZsdsU}sk;S#
z0TjP@2GG5NKZo~og8eOibqbzS?+N~-8Wh|C09hJS#{_S}`@MqqtIv^yc&~&tc)-Lz
w!egu8aRnE?0ZGpbUaK%cxiTU6s}pP-hfP!Gt_~;WME9hlNoxdOjXm#w0l5;FjQ{`u

diff --git a/mozilla/camino/MainController.mm b/mozilla/camino/MainController.mm
index 798600fc450..4011ed5ea33 100644
--- a/mozilla/camino/MainController.mm
+++ b/mozilla/camino/MainController.mm
@@ -290,7 +290,8 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 // Bookmarks menu actions.
 -(IBAction) importBookmarks:(id)aSender
 {
-
+  // IE favorites: ~/Library/Preferences/Explorer/Favorites.html
+  // Omniweb favorites: ~/Library/Application Support/Omniweb/Bookmarks.html
 }
 
 -(IBAction) addBookmark:(id)aSender
diff --git a/mozilla/camino/MainMenu.nib/classes.nib b/mozilla/camino/MainMenu.nib/classes.nib
index 1ebcc627582..d3f1ca53460 100644
--- a/mozilla/camino/MainMenu.nib/classes.nib
+++ b/mozilla/camino/MainMenu.nib/classes.nib
@@ -21,6 +21,7 @@
                 goBack = id; 
                 goForward = id; 
                 goHome = id; 
+                importBookmarks = id; 
                 manageBookmarks = id; 
                 newTab = id; 
                 newWindow = id; 
diff --git a/mozilla/camino/MainMenu.nib/objects.nib b/mozilla/camino/MainMenu.nib/objects.nib
index 297a662ebbeb4824b8bdceba0b635e52602bc949..8813d564eb4548c6a45b54d0cb4dde73daf40f98 100644
GIT binary patch
literal 9364
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

literal 9208
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

diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib
index 1ebcc627582..d3f1ca53460 100644
--- a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib
+++ b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib
@@ -21,6 +21,7 @@
                 goBack = id; 
                 goForward = id; 
                 goHome = id; 
+                importBookmarks = id; 
                 manageBookmarks = id; 
                 newTab = id; 
                 newWindow = id; 
diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib
index 297a662ebbeb4824b8bdceba0b635e52602bc949..8813d564eb4548c6a45b54d0cb4dde73daf40f98 100644
GIT binary patch
literal 9364
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

literal 9208
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

diff --git a/mozilla/camino/src/application/MainController.mm b/mozilla/camino/src/application/MainController.mm
index 798600fc450..4011ed5ea33 100644
--- a/mozilla/camino/src/application/MainController.mm
+++ b/mozilla/camino/src/application/MainController.mm
@@ -290,7 +290,8 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 // Bookmarks menu actions.
 -(IBAction) importBookmarks:(id)aSender
 {
-
+  // IE favorites: ~/Library/Preferences/Explorer/Favorites.html
+  // Omniweb favorites: ~/Library/Application Support/Omniweb/Bookmarks.html
 }
 
 -(IBAction) addBookmark:(id)aSender
diff --git a/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib b/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib
index 1ebcc627582..d3f1ca53460 100644
--- a/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib
+++ b/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib
@@ -21,6 +21,7 @@
                 goBack = id; 
                 goForward = id; 
                 goHome = id; 
+                importBookmarks = id; 
                 manageBookmarks = id; 
                 newTab = id; 
                 newWindow = id; 
diff --git a/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib b/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib
index 297a662ebbeb4824b8bdceba0b635e52602bc949..8813d564eb4548c6a45b54d0cb4dde73daf40f98 100644
GIT binary patch
literal 9364
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

literal 9208
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

diff --git a/mozilla/chimera/MainController.mm b/mozilla/chimera/MainController.mm
index 798600fc450..4011ed5ea33 100644
--- a/mozilla/chimera/MainController.mm
+++ b/mozilla/chimera/MainController.mm
@@ -290,7 +290,8 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 // Bookmarks menu actions.
 -(IBAction) importBookmarks:(id)aSender
 {
-
+  // IE favorites: ~/Library/Preferences/Explorer/Favorites.html
+  // Omniweb favorites: ~/Library/Application Support/Omniweb/Bookmarks.html
 }
 
 -(IBAction) addBookmark:(id)aSender
diff --git a/mozilla/chimera/MainMenu.nib/classes.nib b/mozilla/chimera/MainMenu.nib/classes.nib
index 1ebcc627582..d3f1ca53460 100644
--- a/mozilla/chimera/MainMenu.nib/classes.nib
+++ b/mozilla/chimera/MainMenu.nib/classes.nib
@@ -21,6 +21,7 @@
                 goBack = id; 
                 goForward = id; 
                 goHome = id; 
+                importBookmarks = id; 
                 manageBookmarks = id; 
                 newTab = id; 
                 newWindow = id; 
diff --git a/mozilla/chimera/MainMenu.nib/objects.nib b/mozilla/chimera/MainMenu.nib/objects.nib
index 297a662ebbeb4824b8bdceba0b635e52602bc949..8813d564eb4548c6a45b54d0cb4dde73daf40f98 100644
GIT binary patch
literal 9364
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

literal 9208
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

diff --git a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib
index 1ebcc627582..d3f1ca53460 100644
--- a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib
+++ b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib
@@ -21,6 +21,7 @@
                 goBack = id; 
                 goForward = id; 
                 goHome = id; 
+                importBookmarks = id; 
                 manageBookmarks = id; 
                 newTab = id; 
                 newWindow = id; 
diff --git a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib
index 297a662ebbeb4824b8bdceba0b635e52602bc949..8813d564eb4548c6a45b54d0cb4dde73daf40f98 100644
GIT binary patch
literal 9364
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

literal 9208
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

diff --git a/mozilla/chimera/src/application/MainController.mm b/mozilla/chimera/src/application/MainController.mm
index 798600fc450..4011ed5ea33 100644
--- a/mozilla/chimera/src/application/MainController.mm
+++ b/mozilla/chimera/src/application/MainController.mm
@@ -290,7 +290,8 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 // Bookmarks menu actions.
 -(IBAction) importBookmarks:(id)aSender
 {
-
+  // IE favorites: ~/Library/Preferences/Explorer/Favorites.html
+  // Omniweb favorites: ~/Library/Application Support/Omniweb/Bookmarks.html
 }
 
 -(IBAction) addBookmark:(id)aSender