Bug 1434394 - Add the buddy_icon.png back to the Thunderbird chat theme. r=florian
authorRichard Marti <richard.marti@gmail.com>
Wed, 31 Jan 2018 07:28:59 +0100
changeset 31011 1761d9ef933cc1326e9133d3aa988cde2c902beb
parent 31010 c04bf5ee68a1b4b76ab36ad3c0f9c9aca0c9b120
child 31012 593b026dc5253ba0426c32f88d519fc9e9aab82c
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersflorian
bugs1434394
Bug 1434394 - Add the buddy_icon.png back to the Thunderbird chat theme. r=florian
mail/components/im/jar.mn
mail/components/im/messages/mail/Incoming/buddy_icon.png
mail/installer/allowed-dupes.mn
--- a/mail/components/im/jar.mn
+++ b/mail/components/im/jar.mn
@@ -27,16 +27,18 @@ messenger.jar:
     content/messenger/chat/imconv.xml                    (content/imconv.xml)
     content/messenger/chat/imgroup.xml                   (content/imgroup.xml)
 % skin messenger-messagestyles classic/1.0 %skin/classic/messenger/messages/
 	skin/classic/messenger/messages/mail/Bitmaps/minus-hover.png          (messages/mail/Bitmaps/minus-hover.png)
 	skin/classic/messenger/messages/mail/Bitmaps/minus.png                (messages/mail/Bitmaps/minus.png)
 	skin/classic/messenger/messages/mail/Bitmaps/plus-hover.png           (messages/mail/Bitmaps/plus-hover.png)
 	skin/classic/messenger/messages/mail/Bitmaps/plus.png                 (messages/mail/Bitmaps/plus.png)
 	skin/classic/messenger/messages/mail/Footer.html                      (messages/mail/Footer.html)
+	skin/classic/messenger/messages/mail/Incoming/buddy_icon.png          (messages/mail/Incoming/buddy_icon.png)
+	skin/classic/messenger/messages/mail/Outgoing/buddy_icon.png          (messages/mail/Incoming/buddy_icon.png)
 	skin/classic/messenger/messages/mail/Incoming/Content.html            (messages/mail/Incoming/Content.html)
 	skin/classic/messenger/messages/mail/Incoming/Context.html            (messages/mail/Incoming/Context.html)
 	skin/classic/messenger/messages/mail/Incoming/NextContent.html        (messages/mail/Incoming/NextContent.html)
 	skin/classic/messenger/messages/mail/Info.plist                       (messages/mail/Info.plist)
 	skin/classic/messenger/messages/mail/main.css                         (messages/mail/main.css)
 	skin/classic/messenger/messages/mail/NextStatus.html                  (messages/mail/NextStatus.html)
 	skin/classic/messenger/messages/mail/Status.html                      (messages/mail/Status.html)
 	skin/classic/messenger/messages/bubbles/Bitmaps/indicator_0.png       (messages/bubbles/Bitmaps/indicator_0.png)
@@ -207,11 +209,8 @@ messenger.jar:
 	skin/classic/messenger/smileys/shocked.png           (smileys/shocked.png)
 	skin/classic/messenger/smileys/slant.png             (smileys/slant.png)
 	skin/classic/messenger/smileys/slant2.png            (smileys/slant2.png)
 	skin/classic/messenger/smileys/smile.png             (smileys/smile.png)
 	skin/classic/messenger/smileys/sp_laugh.png          (smileys/sp_laugh.png)
 	skin/classic/messenger/smileys/straight_face.png     (smileys/straight_face.png)
 	skin/classic/messenger/smileys/tongue.png            (smileys/tongue.png)
 	skin/classic/messenger/smileys/wink.png              (smileys/wink.png)
-[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
-% override chrome://messenger-messagestyles/skin/Incoming/buddy_icon.png chrome://messenger/skin/userIcon.png
-% override chrome://messenger-messagestyles/skin/Outgoing/buddy_icon.png chrome://messenger/skin/userIcon.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a014c14adfacdd7ec1772125e10021eac94f561b
GIT binary patch
literal 439
zc$@*Z0Z9IdP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0004gNkl<Zc-rll
z>rTTk3`RF#NCS517?*)ST-s^CpcHizu+sJYp9)v<B$(7d>ZEq0SUUf|(>Ar8R?C+!
zU%q?^t6ks(m;xyf0}(Kk9J&pRfEn-w6cr>uPg?jrV5tbbO(_^idh)Lt;Wy;KK!U(w
zjqn>%d;qL9CJ2<AaSL1#1#Y<oLZZMux4?`j5ONF5i2@O~zz0zv;TFh<0!wazgeZ`5
z3rvXuPuv0%qQF?fEc8}0d@N<43u+388LM}2y3`4uNf_jQ*0ZL-T-s7|swr?TP2fON
zpd(G-T2mm96u$f%)-_hjk%S&VS!i;utClu)&;_vz7x?BvyxFiGdWf^n%0TdKK5;iV
z#)~my)xiV$ZXvYl(|Q3eD1WOy@KB?}nr4knZ@<Z_5*w`kJ3Dm^Y+1HgG_j=HruWyM
zCKE0&Q3(u$hcCG^IZ<+;9K$ai5KtcE8wUh()g~7?AW*29+M^=^-710D5rLyBfz%O!
hzO9?)ruemvegmhJ@`UWl(Z2uy002ovPDHLkV1l5{x2*sG
--- a/mail/installer/allowed-dupes.mn
+++ b/mail/installer/allowed-dupes.mn
@@ -31,16 +31,18 @@ chrome/messenger/skin/classic/messenger/
 chrome/messenger/skin/classic/messenger/messages/bubbles/Bitmaps/plus.png
 chrome/messenger/skin/classic/messenger/messages/mail/Bitmaps/plus.png
 chrome/messenger/skin/classic/messenger/messages/bubbles/Bitmaps/plus-hover.png
 chrome/messenger/skin/classic/messenger/messages/mail/Bitmaps/plus-hover.png
 chrome/messenger/skin/classic/messenger/messages/bubbles/Bitmaps/minus.png
 chrome/messenger/skin/classic/messenger/messages/mail/Bitmaps/minus.png
 chrome/messenger/skin/classic/messenger/messages/bubbles/Bitmaps/minus-hover.png
 chrome/messenger/skin/classic/messenger/messages/mail/Bitmaps/minus-hover.png
+chrome/messenger/skin/classic/messenger/messages/mail/Incoming/buddy_icon.png
+chrome/messenger/skin/classic/messenger/messages/mail/Outgoing/buddy_icon.png
 chrome/devtools/modules/devtools/client/themes/splitters.css
 chrome/devtools/skin/splitters.css
 chrome/icons/default/default48.png
 chrome/icons/default/default64.png
 # calendar addon
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/common/icons/address.svg
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/common/icons/attach.svg
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/common/icons/calendar-tab.svg