From 0da9afa0e3b52c2def086c8416abe6108ea74bfb Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Tue, 29 May 2012 18:51:46 -0700
Subject: [PATCH] Add Twitter icon.

---
 data/data.qrc                      |   1 +
 data/providers/twitter.png         | Bin 0 -> 1592 bytes
 src/songinfo/twitterartistinfo.cpp |   2 ++
 3 files changed, 3 insertions(+)
 create mode 100644 data/providers/twitter.png

diff --git a/data/data.qrc b/data/data.qrc
index 238f90acd..51a03f360 100644
--- a/data/data.qrc
+++ b/data/data.qrc
@@ -282,6 +282,7 @@
         <file>providers/mtvmusic.png</file>
         <file>providers/cdbaby.png</file>
         <file>providers/echonest.png</file>
+        <file>providers/twitter.png</file>
         <file>lumberjacksong.txt</file>
         <file>schema/schema-18.sql</file>
         <file>star-off.png</file>
diff --git a/data/providers/twitter.png b/data/providers/twitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf314b20ed541f733d944a95d981358889449073
GIT binary patch
literal 1592
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+nA0*tB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV
z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPA<wUD9OyvQvjKmn3P{y
zVygsnDZ~r81-`y;gY$}^0R;>){ffi_eM3D1{oGuTzrd=COM+4n&cLd=IHa;5RX-@T
zIKQ+g85kdF$}r8qu)}W=NFmTQR{lkqz(`5Vami0E%}vcK@pQ3O0?O#6WTsddm|7SZ
z8k(CJm>U_GSr{5Rnix7dyP7*YSvVV+I2)V6%)qAC+|<p;%+b=o#M0T!(9qSu(a6o*
z&B)o%+1Sv@$;`<Zrq?sCxFj(zITdDaCeU7pUJEz8daay`QWHz^i$e1Ab6_bTAS1sd
zzc?emK*2fKRKYhfIWrH$2SpFWw=StgnPsUdZbkXI3gGay%EV&7qnnGHk&C&Rp%E^B
zL-eMQ6K48A$LNC+2U22z2?0|ehzU>nKn^_fq~-y0Oc5|^yh>%?&A`Bv;pyTSQgLfZ
zuy;nVqsU(4&!6l(<2-z%J_`y*J@U#iH)V6VG*#Y&`>1PpuYyL{n)$8TE2Fxs?ITKq
zqXY^cE_0pWBpy|`a>lL|KNvk%n>0EIul2oLbFbpLs%GFWfuhRqXR8n2seWhqo$uis
zXKS~GzRLR!-u_?M_2}><he(MXjC;cN>RoeVb&=tCe0pbTFVBjkxhZ_#mppp4qsV64
z@~)Fn8Ujoc7nGZCeO0;Y*76P&b=D-|nWv&AS=xGL&gOS0zdgVHWN(9O-|Pb!XXI>o
zxEC)!UAO)8SG8cD0#7^6DRC@(Qi(Z!#XI8#?k)~K%cc-{M#1`VWACM3!j8>Ni4G4w
zE&lT8)ceAd%YqwIKC;Z6blSQnb$Qk*We1V9E15f7M2~Kh|NiK}5|z#GZ8?-qe))N1
zz25Ry6+e^L&OSZMCB?Pi`$FbKA&ymQ+A+L*Vh?O2dCQl)N+}d$nl2|+)OwX&QMx8r
zLRYa|xVK}I^g-Ul11oQH#ah?AtdV32s-4WdJ}f~&DpIQBkjI~ow=cebePO3&T6f`-
zxi3o2-g(h|=28BvANqIpH(##c?}>`q(i2%~v1|SBmpRMs<WKuoZt@~P^UVCtudM6+
z&U`N7eDR_4M|k(yk5ad1Eb98k)%wtQ{^q}D9WzZOdoG=2epo1&BNE;iZq}f%D_?Ve
z*{e5Kb|-W1OzMe9d9%0cPU;+?U7c@2GrvXY{CIO>-P`R<&dHH+tFMTD<nKNB>8_*b
ze*V4j|0L)CnDFxFjv%g?hY}M`D5h7}emh#c*ZTQ~GbUYgpHAJha`wyz^KWY$+sSTw
pXVY}iq=ogjKF!)vJ@-F{0Yh)qiPvZJVwQo*a!*%3mvv4FO#nuYTkQY<

literal 0
HcmV?d00001

diff --git a/src/songinfo/twitterartistinfo.cpp b/src/songinfo/twitterartistinfo.cpp
index 9645dca51..9d3e6eece 100644
--- a/src/songinfo/twitterartistinfo.cpp
+++ b/src/songinfo/twitterartistinfo.cpp
@@ -17,6 +17,7 @@
 
 #include "twitterartistinfo.h"
 
+#include <QIcon>
 #include <QXmlStreamWriter>
 
 #include <echonest/Artist.h>
@@ -198,6 +199,7 @@ void TwitterArtistInfo::UserTimelineRequestFinished(
   data.type_ = CollapsibleInfoPane::Data::Type_Biography;
   data.id_ = "twitter/" + twitter_id;
   data.title_ = QString("Twitter (%1)").arg(twitter_id);
+  data.icon_ = QIcon(":providers/twitter.png");
 
   QString html = GenerateHtmlForTweetStream(result.toList());