/pidgin/main: 912c6885d616: Merge local
Tomasz Wasilczyk
twasilczyk at pidgin.im
Tue Nov 5 07:41:01 EST 2013
Changeset: 912c6885d616e43c23741ff271ed664a2b05b0dd
Author: Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date: 2013-11-05 13:40 +0100
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/912c6885d616
Description:
Merge local
diffstat:
libpurple/protocols/mxit/formcmds.c | 4 +-
pidgin/pixmaps/protocols/16/mxit.png | Bin
pidgin/pixmaps/protocols/22/mxit.png | Bin
pidgin/pixmaps/protocols/48/mxit.png | Bin
pidgin/pixmaps/protocols/scalable/mxit.svg | 41 ++++++++++++++--------------
5 files changed, 22 insertions(+), 23 deletions(-)
diffs (129 lines):
diff --git a/libpurple/protocols/mxit/formcmds.c b/libpurple/protocols/mxit/formcmds.c
--- a/libpurple/protocols/mxit/formcmds.c
+++ b/libpurple/protocols/mxit/formcmds.c
@@ -267,7 +267,7 @@ static void command_reply(struct RXMsgDa
if (nm) { /* indicates response must be a structured response */
gchar* seltext = g_markup_escape_text(purple_url_decode(selmsg), -1);
- gchar* replycmd = g_strdup_printf("type=reply|nm=%s|res=%s|err=0", nm, replymsg);
+ gchar* replycmd = g_strdup_printf("type=reply|nm=%s|res=%s|err=0", nm, purple_url_decode(replymsg));
mxit_add_html_link( mx, replycmd, TRUE, seltext );
@@ -298,7 +298,7 @@ static void command_platformreq(GHashTab
char* dest;
selmsg = g_hash_table_lookup(hash, "selmsg"); /* find the selection message */
- if (selmsg) {
+ if (selmsg && (strlen(selmsg) > 0)) {
text = g_markup_escape_text(purple_url_decode(selmsg), -1);
}
diff --git a/pidgin/pixmaps/protocols/16/mxit.png b/pidgin/pixmaps/protocols/16/mxit.png
index 7ae49a17f6fb03ac13ff182e5ae674881be97be1..e44c1ea78cbc96d21d3876d0b4c2a3a2a69b487f
GIT binary patch
literal 453
zc$@*n0XqJPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzXGugsRCwBA{Qv(y0}OnuwMzg}0YGd3
z#PSTN;35!T0OAAu&4(7i1Q|gFe5|lD_|M3&0gEPF;35MfgM&cZp${w{O6&xH0=P9Z
zVinZ~xdh}=mVdt(65yJV6f+Tah5q|Oy95 at 7KmP-;$^IkY3aC&33*)bU_Q-Y$&N+<J
z%0K(oF??R$2WJ0=n4rM){}+%0#{a<h at 6nw&4PbE!0;>5B#taaw&-gCP;y<B)<4-7N
zVDbn7v)@Npq688P!!H!yG6=3e2~iki&LFrBi48RXrXK1AOatHmSsV+S5pKXw90nkZ
zqp=~jgNcX0K>T+RY$^=z+KSy)xcGktMlk*d!WS6dn&~wFh3j$0IU~N*naKFoKnIkR
zAAkZI;x|UZX%M31q2Sp|3QR)hFMnY8`QHJEKLRnse~=#u<A*>T0MCse at K#w1<dOoQ
v=>gEpg3a*<!5NQ{VS&)?Yac)Y009O7MlQL5=3ray00000NkvXXu0mjfy^p$}
diff --git a/pidgin/pixmaps/protocols/22/mxit.png b/pidgin/pixmaps/protocols/22/mxit.png
index 0e2bf38b054dd4abfceab976472bde4d3774ac57..9af995c8bd22677edd4e718ac326cb503b6de026
GIT binary patch
literal 590
zc$@)F0<ryxP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz at JU2LRCwBA{Qv(y11$gxHo=dzb`C%)
z0Ei8M*dB-8gFyTMh&S*zAKHK}$%yRY50!QxgBAd>KB_8$4txl5h(Oz+3m67}C<PmO
z04Tyww*MI!3<Ww5UqA_p|9=@K04aWAoQFpVC`c6GE`FbD3v%swbXETui8m1mBnnMB
zv;gel|9=<~(DevSJ511o|937ie4J6q at bCL4WMNRGFJJ<@<IjHs#^3)LkTFp~s-nlh
zpWe>E08$UbK(jz{V1xhv{%-)p49NJ;v7N*juBrz#i~)gvGsq*tINItz at j=MIz?V_a
zz-;3V=f97&LXj6-e2fti#=rkzXck&^0?vLHW`V+gA8yGYh-5Isum9L{9-%PBkVkh2
z8vlKexdIDTh3Mc9x<UVO^MS!BxargbNKpLx{}GZouqW65XkPvQ3)LcQK?zB2zyDnT
zVqmg^VvxdDFOY)bAKsurOR5hM$?ebo3qXvL+<woWh2$bM7XvN-zjG^!i(wcTtQX+P
z?VY(ksF>VOTG_yeJ4>IqumE1Vy*JW3fKm1`l2o#Ri%-EbmlRM-w_pDXAjKvFKS{+K
zs^tk-3;K5&+Sm(v!l3|)umqv&R}Ww{7zW-dX$BxwP5RgkW4s6?KoNC7`0lj at c&jFA
c0)PMm0C$=GO9|Pz-2eap07*qoM6N<$f-;)@WB>pF
diff --git a/pidgin/pixmaps/protocols/48/mxit.png b/pidgin/pixmaps/protocols/48/mxit.png
index 2b05a435a4c13a6651397d6fa5f8ac7d1201c47c..9ba05fd1a92b9cfe258ee855f8a2e89ba4636b65
GIT binary patch
literal 1211
zc$@*d1VsCZP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$T}ebiRCwCdT1!mSKp6f<QG+CGw<H?l
zfsH0AFWG}J#>nfWp3sAOGjQ`_gc#p?QG?N70vtS<uzJzNgOGSJQC#HWD`7!iiDK59
zngEL+7^EF%y4}*U?R0iKU0{+grF5p9?|;qz&n&_i!&+{6*$kS#Q7w^6n4ng_rtSm0
zuONsKB=l>PUIVw at CNiB1;?+Rnnl|YM9hE2>=I(=f2_ghtf!lm!TnQwuXcKSJfVd^>
zwNVYVQAjOpB1{6)m#dEH67e{3w&*cp5^0d`yzR=EK;mK*mB2Ycrs1_UOLzO)xCtaK
zRP#^X&xR~>Yn1NwMO+C?ov)^5^IXXH#cSrc)M_;+3xTO-&0*t)%_CSn4H-TW3f^CG
z>~)qtDl`!U2tb1(4uCyE)es<Pvem%U*($5_`6ETHy;{?P+>zA6(n^fA1uDSjPi_tS
z$(7DA72cN!U{(94W0N2B`6JJ%pYZS9OPK3<3hLYp?<j+S<^z*wi20~cquZIi4f at rB
zTVcb|(@=P|6E<w$O$C_*W}@Ee#3~LG026)(8A7C>xgFMRE;Ku>BZ$yz4FX6-wFF>5
zF+q<=If<0{1yE3T3S5PmMA#sJ$qfP6f`mYdoaOfij}XCOA~aWomYi6{(yCdn<Sj&S
zh$lLQO+G+wTx{-d$8~_YKe=H+O++!l-h?DW14JFJ>GJ%C9t~dBs*RyNuxVd4<kdH@
zwZI4(rUkXqY(hSz`_=~w-^Mf)7Hxy|hYm9|;PNTcYm+9Vc*LR!mS at -&3(*&BfjEpa
zu&5)Y0nDKR`Pn<iXOkxm at bx>H>^DF75%O7yNCp-m#)P!-98STzo at B7@=uYg>1ysHS
z4si+!t&9e8-4B at vP{;6+!t-iS5&1rg6ML*fRzw4^OamT at 46I<W{n7{^Hz&s5$)(tS
z#an^sqHtAsy(TBtYT;sg&hGvpI=W;Mg;E7goSA#Osh+p+;q8}N$=L~J%p6AJo~mup
zCS*r2eL8VdK?6~v7ByfkY~a at qrqdbyT%0on<<UbvO*tcG5Rm)&qizY*LVK(82Nz9!
zIg_;6CyxQfzdA%K8!VbY1RU%obGGcvsnE@`x!KpR;9tv4^2e;bX{a0~V(O<%|Av`M
zO#lP^nQK77-RV1X`zvXc(J7*!!v626Hp=e at B31(X_A<8?y%#vbSWO2%4oGR6yTMO`
z38LCIx7wHsid`tgqR?i$xvLc%l@;Q&;JoU1X*6R9%l)4dwgfa173Flt>kar}N8YWd
zP9FRmb<}`CqO4q)LkrxMZj^_HB5AL2I^>%yDf6EMKbb~(WH at 3wly%HHxvP|#Q)GFf
zCt9=&-=H?%Add}49lz#w&^@uUR3dXq9&|f6HxjQ6<DgsqGLrp4cN&=;CDg3w;X=I+
zhD0YFB?P*P#z!OEe6#(v%0y at nF)u_nSVO6eR?=!Xhxh8&m>#xcMe)&SRtj6|KezcW
ZzyROTRTI>5B6I)%002ovPDHLkV1n+xF>wF@
diff --git a/pidgin/pixmaps/protocols/scalable/mxit.svg b/pidgin/pixmaps/protocols/scalable/mxit.svg
--- a/pidgin/pixmaps/protocols/scalable/mxit.svg
+++ b/pidgin/pixmaps/protocols/scalable/mxit.svg
@@ -1,24 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="48px" height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
-<image overflow="visible" width="34" height="39" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA
-EAMCAwYAAAH0AAACSgAAA6n/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX
-Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa
-JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACgAIwMBIgACEQEDEQH/
-xACyAAEAAwEBAAAAAAAAAAAAAAAAAQMFBAIBAAMBAQAAAAAAAAAAAAAAAAABAgMEEAABBAECBgMB
-AAAAAAAAAAABAAIDBAUREyESIhQVRRAjNQYRAAEDAgMDBwgLAAAAAAAAAAERAgMAEiETBDFRIkFh
-cUIUhcWhMlKDs9M01GKSIzNzwyRkhJQVEgABAwAGCQUAAAAAAAAAAAAAARECIUFRYYESEDFxodEy
-QoKicjNDNIT/2gAMAwEAAhEDEQAAANWbtDvwx51+eStam/NlFqUEyBo7eck8dAFoyr//2gAIAQIA
-AQUAe+RpEry7QJ4POA4FDeR3V9q//9oACAEDAAEFAAAUWjRDTTh8dC6V0r//2gAIAQEAAQUAiihn
-hNOsu1rBMr0HLks9hi7UdSE5ytyx5evM/J6dx6rCcInfp3ON2+CZfVY1z46RMm9IHyveZpW+q8Vc
-rtkr51qbF/QEx0s04eCg2//aAAgBAgIGPwBoxWSbRIyisXvNSfZsJrbFYkFblRlP1FOTHK+J8fid
-XuefE//aAAgBAwIGPwCmTDpJzsE9Tkrzs0VlXLuP/9oACAEBAQY/AIZ54GanU6mJk8sksTZnEyNa
-9Be11rW3IAMK+ChH8SP3dY6KH+pH7uvhNORy2wxscOhzGtc01n9rmvzP85bup2zs2b+JZ1q0csgJ
-adHC3hRVMcR5SN1XWSIqLw7fr0GNa8KQ242oC7Aea4moCAFc14cd4FqV3n4lWjP7KL2cNXfT/Kph
-3ZPtDUL0Nrbmk7i61K7z8SrQyNAd+khaQSm2OPmO6s5G3XXWrgllm1KLyjCjbUN2LSXLsFBha0BW
-kkOJ80g7Leau8vEqy9HPEdO0/ZRTxOe6NvoNeyWPhHIow31wt0rvVS/MVjHph6qX5iuKXTQr1mwv
-Lhzi+dwXpFZWdNZk5SX9fMzs/Z95fivkr//Z" transform="matrix(0.9999 0 0 0.9999 7.0146 6.0142)">
-</image>
+<g>
+
+ <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-0.5654" y1="38.3721" x2="-1.3676" y2="-7.5858" gradientTransform="matrix(1 0 0 -1 24.9448 39.3594)">
+ <stop offset="0" style="stop-color:#D67B43"/>
+ <stop offset="0.2638" style="stop-color:#D16841"/>
+ <stop offset="1" style="stop-color:#CB222B"/>
+ </linearGradient>
+ <path fill="url(#SVGID_1_)" d="M1,23.964c0,17.022,5.954,22.978,22.978,22.978s22.978-5.953,22.978-22.978
+ C46.956,7.315,41.254,1.259,25.077,1h-2.194C6.702,1.259,1,7.315,1,23.964"/>
+ <g>
+ <rect x="20.251" y="22.668" fill="#FFFFFF" width="6.656" height="12.984"/>
+ <path fill="#FFFFFF" d="M30.659,12.288h-20.03v5.796l0,0c0,0.003,0,0.007,0,0.011c0,0.478,0.387,0.864,0.865,0.864
+ c0.008,0,0.017-0.002,0.027-0.002c0,0.002,0,0.003,0.002,0.005h15.795c0,0,3.34,0,3.34,3.34v10.012
+ c0,1.947,1.39,3.338,3.336,3.338h3.331V18.714C37.156,12.291,30.659,12.288,30.659,12.288z"/>
+ <path fill="#FFFFFF" d="M10.629,32.314c0,1.949,1.391,3.338,3.337,3.338h3.322V22.657h-6.659V32.314z"/>
+ </g>
+</g>
</svg>
More information about the Commits
mailing list