Bug 526429 - Theme preview without preview.png and other default icon. r=josiahone, a=mkmelin
authorRichard Marti <richard.marti@gmail.com>
Sun, 28 Dec 2014 23:17:13 +0100
changeset 21703 4c8ddb16d3b32c30106e4bf772b2c10223f7c337
parent 21702 c4d0f6a960415a91bd3655f9747e126846425953
child 21704 e5bb8af1e7e4f30763a557bd409f040bd7b799f2
push id1326
push usermbanner@mozilla.com
push dateMon, 30 Mar 2015 20:10:12 +0000
treeherdercomm-beta@69663dd6f687 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjosiahone, mkmelin
bugs526429
Bug 526429 - Theme preview without preview.png and other default icon. r=josiahone, a=mkmelin
mail/installer/package-manifest.in
mail/themes/install.rdf
mail/themes/linux/Makefile.in
mail/themes/linux/mail/icon.png
mail/themes/linux/mail/preview.png
mail/themes/osx/Makefile.in
mail/themes/osx/mail/icon.png
mail/themes/osx/mail/preview.png
mail/themes/shared/mail/icon.png
mail/themes/shared/mail/icon64.png
mail/themes/windows/Makefile.in
mail/themes/windows/mail/icon.png
mail/themes/windows/mail/preview.png
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -236,17 +236,17 @@
 @RESPATH@/chrome/icons/default/addressbookWindow.ico
 @RESPATH@/chrome/icons/default/messengerWindow.ico
 @RESPATH@/chrome/icons/default/msgcomposeWindow.ico
 #elifdef UNIX_BUT_NOT_MAC
 @RESPATH@/chrome/icons/default/*.png
 #endif
 @RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 @RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
-@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon64.png
 @RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
 
 ; Gloda
 @RESPATH@/chrome/gloda@JAREXT@
 @RESPATH@/chrome/gloda.manifest
 @RESPATH@/components/glautocomp.js
 @RESPATH@/components/gloda.manifest
 @RESPATH@/components/jsmimeemitter.js
--- a/mail/themes/install.rdf
+++ b/mail/themes/install.rdf
@@ -19,34 +19,29 @@
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
         <em:minVersion>@THUNDERBIRD_VERSION@</em:minVersion>
         <em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
     
     <!-- Front End MetaData -->
-    <em:name>Thunderbird (default)</em:name>
-    <em:description>The default theme</em:description>
+    <em:name>Default</em:name>
+    <em:description>The default theme.</em:description>
 
     <!-- EXTENSION AUTHORS!
          DO NOT COPY THIS PROPERTY INTO YOUR INSTALL RDF FILES
          It will cause users not to be informed of incompatibilities 
          with your extension when they are updated with Software Update
          and your extension will become unavailable to them!
          -->
     <em:appManaged>true</em:appManaged>
 
     <em:locked>true</em:locked>
 
     <!-- Front End Integration Hooks (used by Theme Manager)-->
-    <!-- XXXben - preprocess this file to use different info for mac version -->
-#ifdef XP_MACOSX
-    <em:creator>Kevin Gerich and Stephen Horlander</em:creator>
-#else
-    <em:creator>Arvid Axelsson</em:creator>
-#endif
+    <em:creator>Mozilla</em:creator>
     <em:contributor>Mozilla Contributors</em:contributor>
 
     <em:internalName>classic/1.0</em:internalName>
   </Description>      
 
 </RDF>
--- a/mail/themes/linux/Makefile.in
+++ b/mail/themes/linux/Makefile.in
@@ -9,15 +9,15 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
 CLASSIC_EXTENSION_DIR = {972ce4c6-7e08-4474-a285-3208198ce6fd}
 
 FILES := \
-  mail/icon.png \
-  mail/preview.png \
+  ../shared/mail/icon.png \
+  ../shared/mail/icon64.png \
   mail/chrome.manifest \
   $(NULL)
 
 libs:: $(FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR)
deleted file mode 100644
index 690efc75867f687aa00741c6030af9fc75ccdf50..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/osx/Makefile.in
+++ b/mail/themes/osx/Makefile.in
@@ -9,15 +9,15 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
 CLASSIC_EXTENSION_DIR = {972ce4c6-7e08-4474-a285-3208198ce6fd}
 
 FILES := \
-  mail/icon.png \
-  mail/preview.png \
+  ../shared/mail/icon.png \
+  ../shared/mail/icon64.png \
   mail/chrome.manifest \
   $(NULL)
 
 libs:: $(FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR)
deleted file mode 100644
index 2a1fa3c8ce31a055302f32e3b6867bddfb513596..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6c9374575a9587ce4c8ea56d54aef9b0e58eec4f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
rename from mail/themes/linux/mail/icon.png
rename to mail/themes/shared/mail/icon.png
index 7317290ba6ffe7a20db8ec0566e61a705d454aec..dd0b1691d2aeb9abc85a7648d20c581b0bebf46f
GIT binary patch
literal 1221
zc$@*n1UmbPP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000DxNkl<Zc-p;}
zOK4nG9L6WHiIEmHRViu_s)7+g5k-V{5lBMbk4a|ooXK<YekYUHWMLOB+=!@%hzeaO
zzL26)6c@#kqKi^WvBeSs3dM%D*etYCo9glR4fhUr#@m~jm}KB%?#w;+|9$`GIoIb)
z<I~X4kYisrH#e_LPfwfC(NPl$h2Hh;#HXgFCN7|?tZYRH27{)lsmWATRlT?)0;;R4
zf5KZ6jYiG*__*op>@<yyji$c7J`MyLgqh;v;=hWDiry+IDY<V;h$|{8a=_=Ut*u63
zpP8BQgwoQ|(qec<VooBYbkpQ`REVKlBA=L;*pS?bsi`T`-Q8_!YikW6PLis;Og$f{
ztE)48eSH}by9rV1uy?((vhv|{^Bq=RhlYm!7r7H%U0te^b#T8YIUy_X`~C4;&d<-A
zxw*M56QRPz{;H<{$bVJXRPB(T)%R8jkgc}1HUr1ouH=M0qJonE!XM;;dj<vu5(X5J
z+1c5+A%{q_u&`iau~_21mx!^kv3UD3*dF<hfIuK{Nrb(<y{h`(==VYi5{V2?PEKkD
zyw1IRt>^dCAOv0o$HBTpX|2R~r2=O^Ng_wplM0U(NB~45;ASKevHSZxzxQoaz=*qZ
zczF0*uheOfX^N%_nC<E5k^0};+uP$eX~9)Oy^cYXNeg#$bUf=!og2d8uu@T*cnC$G
zs_hVPRV}0cAl|R(hlnMR(IAl%UiF~)0_Q6}#}0Q|p-J_2adGi($iD=ifn8~mKY)i9
zy;^u=WW>OEH1QDmKc~Dgwf<q2KV<)p7da5$1-=Kbc@bmy4%QS=j2}}AH@x-^6*N32
z5)Y&J1OnE`pKctGw~*(9T&@p+OJEsHq!ROA0XPhP20wx*_P$d@y+$-0w&WD>9uHiR
z0HSfwVO->EAOIc%7p?0&5CX@+-{1rAy!{+?^rz;7;Fbz&k2vNO5K-l-IvEnXQ^_5I
zUa&-52490_Fb{sPYlLFnF9L`TlZrF98%S`ykr2Re*sJYR)v1lhjocyPUa-gUdzU33
zYSluXBNE0ElLX7zaFSs}oYGCI)7YU-x9zMtkl+HxY<b2WZcZpAau&Y)BqI!>Lu$kR
z{(i$*;3h|_CD6dhW_Ow*X22;s6^!<nB9JOT^8xa+u0|NW#}qO_LKF?o2kV@UmO%_W
z<sl#`6&zfDNj+1@d(8lZ1zn90f$YJ-!E3fszK=4DZh$ok=L`DxGDfcu-gnB&%c~KT
z>ynDAv~r=&hHiTTPOf-{5`}x&e6Fd5_+GUN>j;M5)HOz*V7L1SQOk(BPL#gl$km6K
zeOBlLbkce4Ely(XkV-KH_~?fD#BeTi;k2TFpo6zt$FzH#H6J4890LEK=)QsfC2hIR
zNhop+CZgxh=x~bhF4aStMff1X-=}tN$x}P$azf-p)4%B>Iv!-DvyR$0qw}Qgwe=!%
z0UX%YH>c9l(mkAbFQ~s&J0e%)AU?9K#N;^(l9xrMP}?mmFovJo_IE}+&DQ8eNVa2J
j&hqWl#}+`YH!a{_kYk5`Vei>h00000NkvXXu0mjfE%#OF
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..533aa1329ecddf09c9701d5b7aa727a7ccbf93fc
GIT binary patch
literal 2284
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
GLSTZwsuK_Z
--- a/mail/themes/windows/Makefile.in
+++ b/mail/themes/windows/Makefile.in
@@ -9,15 +9,15 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
 CLASSIC_EXTENSION_DIR = {972ce4c6-7e08-4474-a285-3208198ce6fd}
 
 FILES := \
-  mail/icon.png \
-  mail/preview.png \
+  ../shared/mail/icon.png \
+  ../shared/mail/icon64.png \
   mail/chrome.manifest \
   $(NULL)
 
 libs:: $(FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR)
deleted file mode 100644
index 1d662c10da2bde7b597f2f5742246fd8ec2fc607..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 7607bdea4d51e8e2c89bf67815c45a161e9dd96e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001