Bug 920801 - Port chat/ changes from Instantbird to comm-central - 6 - Bio 2079 - JS-Yahoo has no protocol icon, r=clokep.
authorQuentin Headen <qheaden@phaseshiftsoftware.com>
Thu, 08 Aug 2013 14:55:17 -0400
changeset 17201 d2bb806f7e34f52f8acdccc884f3d05c606494e2
parent 17200 4cec969a5e08c48aa6cd88f4bba430116243fca4
child 17202 a387c35d05cd47cd7583a41ec1c122995347a01a
push id1103
push usermbanner@mozilla.com
push dateTue, 18 Mar 2014 07:44:06 +0000
treeherdercomm-beta@50c6279a0af0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersclokep
bugs920801
Bug 920801 - Port chat/ changes from Instantbird to comm-central - 6 - Bio 2079 - JS-Yahoo has no protocol icon, r=clokep.
chat/protocols/yahoo/icons/prpl-yahoo-32.png
chat/protocols/yahoo/icons/prpl-yahoo-48.png
chat/protocols/yahoo/icons/prpl-yahoo.png
chat/protocols/yahoo/jar.mn
chat/protocols/yahoo/yahoo.js
new file mode 100644
index 0000000000000000000000000000000000000000..aefe383c32c0cdd7ab2a1a3746a8feb62dfbf0a5
GIT binary patch
literal 1438
zc$@*A1!4M$P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000R(000R(0q|s!N&o-=8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11sh33K~z|U?Uq|iR96&+|F!p-JHr4D12|mNpe+!TQW9kvEND#{
zm9){Qq_r2DG;MtBC27;7l!qow`qZSaw)I5?Vzr=6t!>IJG+q#BqE@GXj9k2MQx42w
zX3k!H5Ue)bOxw^0SF)3n{Cn;H+iRbly@;8ylp&VX{V~8}fd2!41^|bN-qL{W0A}ta
z&-P6KGr$T6?qUA$UjrcEQg$Hl+S>g55GE#KikX;*rnPBz67YB|7cX4!UukWv1%M+&
z+Z5m?Kq){Gpm-WG2K?|kvvG)M2LS7XrV23jG9SMWP{G_>A0IE*=Hz(f)RZBIha+fc
z7=e^zZr+>>kH-Q4#@Lv%=iE8Hg1Pz#QAX;@m7izl=HA6UKw@SvfD0`xzRo*$>Hr`q
zA>qrX3JTI@%=>$LW1*g&F97@n0074L_^00;IItf?iHTWRsU=&t4r+~!!+#JJv{hGU
z*nraj^ce6i?rrJq{KCTUvQww}pz9`<FSjBoNsH#?B`RINRLQIWz+tzCQ(`e-Yz$Gq
zALj=Lg9*R~4;=vj>|(A1P&ZxLK(lEc+*n*3_r$ep1Myq7Or2?LOpHb%FYIBy4FFMK
z`)_S+3F}Hrok?9?LtQB;%dUq)n$gr`H%;^7nRS_&5sd<FH`;^2p>e}_c^h+VMxXT-
zR4}&=UBAAs`SN9NEG;c1t)nBdWz(iKm&emmOZ0RVk+2KVvC{94CFwf#`F#G4hK65n
zcX#JJKQNHFi}{;}0Bkng*0ktgcXxFKbNfSP%sl6)1xgyy(?hY6l0mlHuSLtsZZu_N
zgpO+3xq;Hs8@z5^-^iv-w~k49`V&CRw#Lt1Z!o%ZC!ch=uGRq7zw7e?Ff(d^XPeT~
z`_1BForSo=1qHfZS~|%Y8RL3c*<`)V)?NcR=F0!c>%Dq5JA3#ruzoguL4fH>ls5bQ
zH_Y|xnTeRC<jBU2eA4aissWPc%RMUP;4$F9T>7E_?n7i|-sHSI=KOsAB_*ZrAh2ek
zyu-lvUjz1k48Y8&)3oy(2rzHh!1bDTb}=~z0snmZBfSL-5FW9EdX>3<KK)T2BU<dl
zuZY}>nWxPsRuPF@V7~&Q3NUO^dS)tM0<J?u&oN+Oz_J&p2Q$|aB|Gi*6Hl&Mwc>=s
z(RJ4_w!OqWI_Hk&Yf29h735}TH)Z&IZW91B4Zi+<KuYxad?sQs7DS?Fa4>v)a`KfQ
zGczx}*V*|_d2#WZ384^;WM-;{mX^<UnC3@wdCYkPMMXtU*0enitJNJPf+7N&CT^yt
z;-=RND<G{Fi>7IsSQZ!ON;QlMW|3n^xk5@w7#)R0N)eVayRfh@IS>dq7F~g&q9SM1
zW{Z3A%9UqqvDlg@k<%2yX_B;=LO5drc17e+fE6GqnAMQoG0^GrUR*VH*S2qT`2E#c
zS<YZ@ul}ve^+uc5`@68&#$C+gt*x!$1p!vC-fHuBZn;g1CC-eJ8_J9mg50KLmsAu7
zuu}m}Az)<%Ndl%)hzMX3L=zS^jpF|P^fSq6ZHCo8Dm0~Al^P!z8PS8m;M9Tu08mv`
zC2DJHop3ti1mGlQryz1DB0HF^FkvB$?lm+fSTUQBh>{XhB-E5*4l~gtO<8n{WlC>r
zYYX!%X7m1p5614@yJdTOyXNtDq;9uMhs7eTlamqv!d9!A2#1x!FwFS)cry}-#LCOd
s&C1G3wa~hY2KcXH$-Cmm080+=Cz@=8&UF&x>;M1&07*qoM6N<$g0XR;L;wH)
new file mode 100644
index 0000000000000000000000000000000000000000..f454f26d3c720fba9de9eecb362491460394c093
GIT binary patch
literal 2439
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
FV1ijzptJx0
new file mode 100644
index 0000000000000000000000000000000000000000..4cff5da7fc2c1802f64cd36c5713cb4aa9aa1d52
GIT binary patch
literal 531
zc$@(f0_^>XP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10gy>VK~y-6)swMHTTv9of9K`pB{3){8Qfakq=?Xt75p0n!QxvA
z4&B7RKy<WF2wgh4<$<NOgbrN<aSFDBgOx%HLZ=d;r6@Jem%QAsLz<ANo$S&JXS(0_
zyXTybYm&Il@owe*7XYi6HO<TeOp?(V$t;ukwUnmAH<=={?%auwlwDk3$IQSC16oPK
zo6XH^)B(5q&7ov~reOOsjQIdBH#Qu=!?`){&g3M!)v9ytcF!0tFLz$v+UkM6!Hk2a
zK2VTz0QcV4YPGRA4(^VQ+NU_)X*L><OQlllXn#NR@#Lg`Upj{g;H~w?xE%y5!@1nE
z*^v?dUA->noQ)R>{Djjaj;Dbiq2wa7)Q5vbX%<NXwNotaeFy>xbnJP0mCt{#z__H9
zuBHO53Otc?J;wOrV*X3B3BZx$lFQ2np;QN+cQqco0IC4~U*hT0@-;F8$md`!h1D#S
z7o=0@WIq51ueJn4ARx%V*?kx~gvKMOIMBhL%!zIQ02WH=YqRnptol&yUHt!_={Lab
Vw_KXdlxF|{002ovPDHLkV1iT4@tFVs
new file mode 100644
--- /dev/null
+++ b/chat/protocols/yahoo/jar.mn
@@ -0,0 +1,10 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+chat.jar:
+% skin prpl-yahoojp classic/1.0 %skin/classic/prpl/yahoo/
+% skin prpl-yahoo classic/1.0 %skin/classic/prpl/yahoo/
+	skin/classic/prpl/yahoo/icon32.png	(icons/prpl-yahoo-32.png)
+	skin/classic/prpl/yahoo/icon48.png	(icons/prpl-yahoo-48.png)
+	skin/classic/prpl/yahoo/icon.png	(icons/prpl-yahoo.png)
--- a/chat/protocols/yahoo/yahoo.js
+++ b/chat/protocols/yahoo/yahoo.js
@@ -405,16 +405,17 @@ YahooProtocol.prototype = {
   // Protocol specific connection parameters.
   pagerRequestUrl: "http://vcs1.msg.yahoo.com/capacity",
   loginTokenGetUrl: "https://login.yahoo.com/config/pwtoken_get",
   loginTokenLoginUrl: "https://login.yahoo.com/config/pwtoken_login",
   buildId: "4194239",
 
   get id() "prpl-yahoo",
   get name() "Yahoo",
+  get iconBaseURI() "chrome://prpl-yahoo/skin/",
   options: {
     port: {get label() _("options.pagerPort"), default: 5050},
     //xfer_host: {get label() _("options.transferHost"), default: "filetransfer.msg.yahoo.com"},
     //xfer_port: {get label() _("options.transferPort"), default: 80},
     //room_list_locale: {get label() _("options.chatLocale"), default: "us"},
     local_charset: {get label() _("options.chatEncoding"), default: "UTF-8"},
     ignore_invites: {get label() _("options.ignoreInvites"), default: false}
     //proxy_ssl: {get label() _("options.proxySSL"), default: false}
@@ -460,16 +461,17 @@ YahooJapanProtocol.prototype = {
   // Protocol specific connection parameters.
   pagerRequestUrl: "http://cs1.yahoo.co.jp/capacity",
   loginTokenGetUrl: "https://login.yahoo.co.jp/config/pwtoken_get",
   loginTokenLoginUrl: "https://login.yahoo.co.jp/config/pwtoken_login",
   buildId: "4186047",
 
   get id() "prpl-yahoojp",
   get name() "Yahoo JAPAN",
+  get iconBaseURI() "chrome://prpl-yahoojp/skin/",
   options: {
     port: {get label() _("options.pagerPort"), default: 5050},
     //xfer_host: {get label() _("options.transferHost"), default: "filetransfer.msg.yahoo.com"},
     //xfer_port: {get label() _("options.transferPort"), default: 80},
     //room_list_locale: {get label() _("options.chatLocale"), default: "jp"},
     local_charset: {get label() _("options.chatEncoding"), default: "UTF-8"},
     ignore_invites: {get label() _("options.ignoreInvites"), default: false}
     //proxy_ssl: {get label() _("options.proxySSL"), default: false}