From 8fc8e7336169400a05454a5a23959382111ed1f9 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sun, 8 Sep 2013 18:58:27 +0200
Subject: [PATCH] some cleanup in icons folder. Fixes #7455
---
.../apps/{gajim-about.png => gajim.png} | Bin
.../16x16/actions/gajim-message_corrected.png | Bin 873 -> 0 bytes
.../16x16/actions/gajim-receipt_missing.png | Bin 529 -> 0 bytes
.../16x16/actions/gajim-receipt_received.png | Bin 861 -> 0 bytes
.../16x16/{actions => status}/gajim-earth.png | Bin
.../gajim-muc_separator.png | Bin
icons/hicolor/16x16/status/gajim-plugins.png | Bin 0 -> 541 bytes
.../gajim-security_high.png | Bin
.../gajim-security_low.png | Bin
.../32x32/categories/gajim-agent-error.png | Bin 1333 -> 0 bytes
icons/hicolor/48x48/actions/gajim-warning.png | Bin 2190 -> 0 bytes
.../gajim-chat_msg_recv.png | Bin
.../gajim-connection_lost.png | Bin
.../{actions => status}/gajim-ft_done.png | Bin
.../{actions => status}/gajim-ft_error.png | Bin
.../{actions => status}/gajim-ft_request.png | Bin
.../{actions => status}/gajim-ft_stopped.png | Bin
.../gajim-gc_invitation.png | Bin
.../gajim-new_email_recv.png | Bin
.../gajim-priv_msg_recv.png | Bin
.../gajim-single_msg_recv.png | Bin
.../gajim-subscription_request.png | Bin
.../gajim-unsubscribed.png | Bin
src/conversation_textview.py | 18 +++---------------
src/dialogs.py | 2 +-
src/gui_interface.py | 2 +-
src/htmltextview.py | 2 +-
src/roster_window.py | 5 +++++
28 files changed, 11 insertions(+), 18 deletions(-)
rename icons/hicolor/128x128/apps/{gajim-about.png => gajim.png} (100%)
delete mode 100644 icons/hicolor/16x16/actions/gajim-message_corrected.png
delete mode 100644 icons/hicolor/16x16/actions/gajim-receipt_missing.png
delete mode 100644 icons/hicolor/16x16/actions/gajim-receipt_received.png
rename icons/hicolor/16x16/{actions => status}/gajim-earth.png (100%)
rename icons/hicolor/16x16/{actions => status}/gajim-muc_separator.png (100%)
create mode 100644 icons/hicolor/16x16/status/gajim-plugins.png
rename icons/hicolor/16x16/{actions => status}/gajim-security_high.png (100%)
rename icons/hicolor/16x16/{actions => status}/gajim-security_low.png (100%)
delete mode 100644 icons/hicolor/32x32/categories/gajim-agent-error.png
delete mode 100644 icons/hicolor/48x48/actions/gajim-warning.png
rename icons/hicolor/48x48/{actions => status}/gajim-chat_msg_recv.png (100%)
rename icons/hicolor/48x48/{actions => status}/gajim-connection_lost.png (100%)
rename icons/hicolor/48x48/{actions => status}/gajim-ft_done.png (100%)
rename icons/hicolor/48x48/{actions => status}/gajim-ft_error.png (100%)
rename icons/hicolor/48x48/{actions => status}/gajim-ft_request.png (100%)
rename icons/hicolor/48x48/{actions => status}/gajim-ft_stopped.png (100%)
rename icons/hicolor/48x48/{actions => status}/gajim-gc_invitation.png (100%)
rename icons/hicolor/48x48/{actions => status}/gajim-new_email_recv.png (100%)
rename icons/hicolor/48x48/{actions => status}/gajim-priv_msg_recv.png (100%)
rename icons/hicolor/48x48/{actions => status}/gajim-single_msg_recv.png (100%)
rename icons/hicolor/48x48/{actions => status}/gajim-subscription_request.png (100%)
rename icons/hicolor/48x48/{actions => status}/gajim-unsubscribed.png (100%)
diff --git a/icons/hicolor/128x128/apps/gajim-about.png b/icons/hicolor/128x128/apps/gajim.png
similarity index 100%
rename from icons/hicolor/128x128/apps/gajim-about.png
rename to icons/hicolor/128x128/apps/gajim.png
diff --git a/icons/hicolor/16x16/actions/gajim-message_corrected.png b/icons/hicolor/16x16/actions/gajim-message_corrected.png
deleted file mode 100644
index c0b39d791547d443f88c995d7979fc621a7323dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 873
zcmV-v1D5=WP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0009pNkl<ZcwSYJ
zOK4nW6o9|~zjy9Dl1!RTlcv?lvo>u_M3mq{1>>WO`T(sUh=gu*BjQ5Ps%tGupwd+r
zEkp!2K0ti6TCB7v3R-R2G-*htnWkw?CNs&r@66o)KL(R7{NOCk;`=yol$SgWfan;u
z?qDNcJTbWSK+k>g$9D|H?^YUhYqD^4{?F2x?B&&ORoTxuUI4ZXfXgPvH$;cppMC7*
z?y>#Dk-pv*h>8WE_Hg2XbSW`<`mfH#Gba|_E?-#u#B~7$|6Q;y(=@XC@aUWUM@Dv9
z!V(a26pj*v4Xjo8IGkJ3oct*LLGimQhn=uSOU<D7bUyRc>-|TDw*^R0XG_Qs1T~7*
zQdf!^;A06)gZtYW9DKF=Ep_jmqf!&x!1G!LUK}_!lrZ=<pw%%9Ct{Qv0aN)ZGgU!*
zVIoRnvG~@ouT?Yn((a>w&t$*H9l7}Y)8|Cqo2<&QR9VKatx2(Aq+&&?*2-L=BA?D@
z<o(%IIXYjF<MUPdaH=9N{3hZZn0&>J4YWTI4q1FLGy+gs0I(vU6nC^ld9EqKY`)C-
zOo<zTOGt(Bw4r&h{ZZ}o#P>GVP2UOu;AlXBQVIna0izUmwKa2S*EaTVQRK@d{D#3v
z#=Be*uz&y>g`*XljoW|%4b)9QDVHUvdl*q5f)1{&PFKanSa3Cj{%3CN+E^}KU*zN;
z)BIEk;WoEX6-_;zzpiUD*&nkNP0eUr1<q!`RU2}8DZ>{NQ~X>AP|00%baYS;G+E!F
zI+;DI&FtE#f3B7n3WTwu(SQT2tmZj&d787?BC4y8&Sa9Ps|k!ykPtUhelD2KeyJTJ
z#g)(JUYpA~l&nh;mv2%x_~F(H^_@w&`uk`OdnjWFEEJ4OsuW`Rv(y_-wUN;}5`xs)
zR};tQ-o3Ewl5=9@x9%X(+ecfx2}fB(K^;X-LR`$P&x!PyOlHS*%tM8He*r*h7H3c5
z;NC+$V-G$Q?b){-wnsq(mZ~tl48Q*F-@G!OekZt;`B;TD!0o{1-whbgYmE%FKG}Xx
z{E@c4Shredb-uEYnJApEOs#$G__ZwVMi}5<rfG~I#6Y6f00000NkvXXu0mjf?GmM&
diff --git a/icons/hicolor/16x16/actions/gajim-receipt_missing.png b/icons/hicolor/16x16/actions/gajim-receipt_missing.png
deleted file mode 100644
index 4332bc44e413ec867dcf8a0773497600ff77dbf8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 529
zcmV+s0`C2ZP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+z1>B4Lbdz_d5Up0iH=j
zK~y-)oszw76G0S(zdJ0Bf)$K}*WlQ}N-zeAM2Ln5L878Zv^>EsuM_+NREQ=`gs_lO
zP`F7+nh0dC&F;*hu-CT0M1~_xF;}DWcL%P90GaV$(AoQa4Nnd=Ct3@)ZfHh2=*P4V
zyWH({81!SzNH->sNGi1&H*W1v+1_Gj_YM-THX<n1_l~-YS@U6sK|gN(&BY%EzJBN_
zAHOWKD<3`A@Z@N17r#452K|`U<NFZCOGfW$c3W$^a4XgU(rTm5)^-JXzkKC$qU(;@
zZUc#Ab*-xo($nJxtw;BeFObid4)Pr3IgL)t>2U*Cx`;}3iKO0+am57xQy}r?bsK;%
znZ<Et#Cvt5Z;2VH1Xecx`CXiJpLDQLK=4SKM|0rjMx7(b7=AhD>5GfE5@}SbdmI{n
zClon^01`K!odfXW(*Z;gW`>!O2SXwOQU|lWKiIDlvJskOXqpkGlSKz%nh~-QVUiKD
zF};H-gMJK<L=uVIH8jmoQGjOZm~r{>_M$}0&@3=!hM!$hfTa8||9Uq4nOEW$+6Tz?
T1@eNT00000NkvXXu0mjfw2$L)
diff --git a/icons/hicolor/16x16/actions/gajim-receipt_received.png b/icons/hicolor/16x16/actions/gajim-receipt_received.png
deleted file mode 100644
index a6910ddfc229b837dee655d33d449b2bb9585766..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 861
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE<hRxemd{22U45`9+AaB
z+5?Q;PG;MI1j`B>(}6TtKSRv1wTBrPnA$vD978NlCnqeB&PYv2;A6gI$`j)w%Cp92
z>XM9khYl!M_xCrJn{94->~z|-P+Q6Chu6%TqS8k@FW5|MbgZ)DXTGk(R{4ABGU-oY
z%m4GwdiXceqJ4GC!KsbH`=3cIcvk6fHdyjW?sTdA6A`n2=vVB!UjI_8@xRv7P5Q2X
ze%MM%q!}6f`Tu{uW97~%8$ShUTDRTg@j3IkVb*R5i6zg94GYetOxPZkxIr=3{m%Xe
zz4QL3KL7ZC`irMObFU}ZMcevBPEvfbO1Jq~kmTw+&6?A@_)={rMQe#1m~i;OiXCnp
zjwPzI_Z&8x%q!{s=)bG%r~m8shJM?BCuiY(rA(XRmb;ZlRg_pIB;G8W6?t7wYxjmn
zzZU)PUU&BA{1S~%3tv?k);G`f>WX8}H5ZxV|9g6s-K+g)4fp=H(tcXs{q)n>#L@(T
z$DdNu61K4Kx>C3()Zx^!8OxV0FaCFam+{a4Q*PV-pX}FW?_(`oyy#om$NPV7YyPiY
zck}P|TdRLZ?~1I@^R{WW2$vFO_GUDhW21I+<E}5akIc}$S|?U+_@e&$;$#2+`rrCj
zZkzch{-@3N`Y*xv|I1C!sat(^`s~wp&#CBzoIa}XOG<MA>!%x%5q~8jjzm=?`I=?h
zb=OLK*#EEg<o{#-OaB|&yZ_~{eDv@3j|JCao|+0h>grx9@n_%5gkxgq`W8z!diV)-
zl-eZx(|MkK=YLmy<p0U{+x~B}PPe-LXG`CXbBUsD@9ZsiERIPNm2W<f#U}QYHE83*
z^uP0_?mzWcxa?|u-krMwh3~u9@r3`&SDy32r+<}khMaKn#v3^jvIWOBD?bn1)bdx<
zIKk?tbIqpjwW+5Cz8&k;{L-tfeb|bv&HaD=WwXgl4C%pdFWBmRF#sk{)e_f;l9a@f
zRIB8oR3OD*WME*a3q*#-A%@0Q#)ei#M%o5ORt5%QQr_=TH00)|WTsW(){yT0IT)yc
N!PC{xWt~$(697(@gwOy0
diff --git a/icons/hicolor/16x16/actions/gajim-earth.png b/icons/hicolor/16x16/status/gajim-earth.png
similarity index 100%
rename from icons/hicolor/16x16/actions/gajim-earth.png
rename to icons/hicolor/16x16/status/gajim-earth.png
diff --git a/icons/hicolor/16x16/actions/gajim-muc_separator.png b/icons/hicolor/16x16/status/gajim-muc_separator.png
similarity index 100%
rename from icons/hicolor/16x16/actions/gajim-muc_separator.png
rename to icons/hicolor/16x16/status/gajim-muc_separator.png
diff --git a/icons/hicolor/16x16/status/gajim-plugins.png b/icons/hicolor/16x16/status/gajim-plugins.png
new file mode 100644
index 0000000000000000000000000000000000000000..096e098b4bf4d21769a01f6202076de6ca52e64d
GIT binary patch
literal 541
zcmV+&0^<FNP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzzez+vRCwBA{Qv(y10{fofkMF2xIF9-
zkhVn<I}F5jP&T?8SU%0Y7A!9*q|3na`}c3#46k~)?2K)V$Qn@OVDf+e{YALo*Uw)J
zS03zu3;h1|hvEPKe_TK&8zUnViW~@l)c^hW2i1UYKfl2RG-M1JuG~BI6{J~5$p}Rb
zX274n2m=^1yKUh9loS<bus8By5a5<(U}R)qc=!1U!{gVNQ4BbC{xot}l`tkXo5BRR
z7#SJA8tLgWu(7Z)fTH)`|GyZaZmk^wrq5hE#BliBw!JJre*8c<2k7h{zkV=$|MeAT
zwCy}Q8%)cHXfgc!`OBH*=Z~LoFBt3C05!h{2GVbW@qg^XZiXM<zaL=v_2Y+ad1gOY
z@cxSnz)-&jX8->ONui8Pj3^qfoxg`11})%NSb4A$MbYag?-@S4{Q_nS2=g$A$_S#w
zLS^m*u&MTX;gD$j`RhAe0m$Z8Pv3z85v=Rg(_im-McCmk!AJ+dl*sVw&o4wk{%2zN
z_3IZX5I(@t)}OzBS^xk02jKwK|An%_2K@c==kU#wkC2luNb@cv{;nIR9=HK%RwTb8
fSx8}a1_&?!W$xIpcs8(|00000NkvXXu0mjfoW}qv
literal 0
HcmV?d00001
diff --git a/icons/hicolor/16x16/actions/gajim-security_high.png b/icons/hicolor/16x16/status/gajim-security_high.png
similarity index 100%
rename from icons/hicolor/16x16/actions/gajim-security_high.png
rename to icons/hicolor/16x16/status/gajim-security_high.png
diff --git a/icons/hicolor/16x16/actions/gajim-security_low.png b/icons/hicolor/16x16/status/gajim-security_low.png
similarity index 100%
rename from icons/hicolor/16x16/actions/gajim-security_low.png
rename to icons/hicolor/16x16/status/gajim-security_low.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-error.png b/icons/hicolor/32x32/categories/gajim-agent-error.png
deleted file mode 100644
index 62714e18972cfaaec15e3a9337a197e03cc07b80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1333
zcmV-51<Lw~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x00(qQO+^RR3;_`^6EovsoB#j>*GWV{R9J=OmtAO7M-<0@bMM{HY&K@o
zY_c&;q7SR7NvzfgDH1Fe3$4XUPzq{a`qV!6sTA60UkmM1U+M>?B2)|oZ6P3NN)@-M
zNlPNGxF*?b$d~)+?%g}nhuw{v?8caAq0oWD%;n6?|2JpuoI4l(??r5+^Er4;Xxe}w
z#8H%Lwv>7W5V{Zxz>Jjg=R90G4R>BDz<GFA*R-!4b#+bcJ9gL_+uQASj|Y2A4MHih
zsTA2ng1JZ}ADNiQWR{i^d8Ix(1wRN-n+7-w0lTjMRO9#W>N$9@rrzg6Mx$7<7&4tk
zrqiGlIGx~jqct|7H#hTmago1n+(^Y|W+Eu{{)cdX!vJStuT9slb{{&lr7ajVtnqR3
zkqAhMQmSA8rFPK(^tLvPojZw!!}8Cep`?=XgOf1y+yEC~m*H^S=sR}ITW1);424jp
zSrDiqxZ=4~>pHf5`$#Lr?}LM>TrPL`G~8Sl;79ODUBCP0z(AlbpBMSDF_e_3qEH1u
zF%qi*N)fVmb&+wo`0dJ-B`Ib1DVQwR(<+v)>)&<v_xtM%LzttZ1#zXG*40c(l$4cl
zQj#4R!6hX<eSKa-h>NS`RsfuZ-LCrjw_Xhf4Koy~E>tDlYxzs|<o0bE+S@g+&)0b#
z-d+>Hq3hr5?(g^J$H!6me8ohp7l}3e(lp7AjS=kat<#10wkp8);MY8!*Xx>^gf%%?
zeTD0+^jUuM(Ieaq4LH1B|2gQc0MOuQYcMEeG`eY#bs?sv2y}F~bQq`ru<7~{e_NZ&
zip5??<XQfFG|HBi7Mmu-k&>>lyctTh+dUp+Dz!YI`N4yVL$aANQD2Wz3M-k!=J6n*
zr6K|fn(S^jGLu=6WL`!oMM7pW*qu(4QofSUSkbXcmU}4xWqD!stjiG)5X+@fV7LD(
z04N0x2ibHQ0ShHx`8)9NNg}bk*5yLQ<0xRVwRP>pQy8<RzkKB-pXPRxOC%6NOjGQ$
z9060Q!MR8zBmDkNz2Ox(qsn-rxtXQuX;UdRSg{2XE>GRRue3m*>LgWHyFo}}>sDfs
zNXCLo6#yT>Y(AO%<8dse^p=*Vg2fNbi{=8OwUyNTJh^y$_7vQ$001y8>(kNU;keP+
ziPH7w7g`4rO~cvMMK~0CY{4hxnkxWK!$@{<acC+W&O7$*ec{YkGS~k7%ts<JxwQ26
zN%(b5005!X$K%7pvk9e?y{BizWn;q-fOF3tvbxShC=|Eg_-efhfD^Ewq&ytDb}gQA
zyOp!A4-8|&5EuqE2M%C*y^LPJp0bpBZ}n{m*141#nsznV*SDp4`*tHcI!Z1aUKXdg
z!irM@*tc!N+1<_j!-sO>)~%#cYGaquVllpeS38Bc=xJ>14EFZAYrS4_Q&X7J)5t^u
znNAlHlFNnecB2OZ*jidhB@%@1+({?q<|gmK@vq<>kO$250Cd0x*vsqB;qXo&zI4~t
z`kFdA?7l$2uzNh%TrL1|sT5{1$wD-0%|s&EOgx^t2WQT}<t*eVm|3*avsDd1D+)WR
zft-LHZ@@c#Ar2Z!HE2)=XcojRn4g84Bk;?G!Z|lriI(b2c_f~-1)>-cox(T6R@T;w
ruzIntr0@%tFShfm%qr{i-zxtA*(_WaxDxf>00000NkvXXu0mjfd6<fc
diff --git a/icons/hicolor/48x48/actions/gajim-warning.png b/icons/hicolor/48x48/actions/gajim-warning.png
deleted file mode 100644
index dd1979512fa2d63e4e7b413219382c302cc21674..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2190
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
Qy#N3J07*qoM6N<$f*>+F(EtDd
diff --git a/icons/hicolor/48x48/actions/gajim-chat_msg_recv.png b/icons/hicolor/48x48/status/gajim-chat_msg_recv.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-chat_msg_recv.png
rename to icons/hicolor/48x48/status/gajim-chat_msg_recv.png
diff --git a/icons/hicolor/48x48/actions/gajim-connection_lost.png b/icons/hicolor/48x48/status/gajim-connection_lost.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-connection_lost.png
rename to icons/hicolor/48x48/status/gajim-connection_lost.png
diff --git a/icons/hicolor/48x48/actions/gajim-ft_done.png b/icons/hicolor/48x48/status/gajim-ft_done.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-ft_done.png
rename to icons/hicolor/48x48/status/gajim-ft_done.png
diff --git a/icons/hicolor/48x48/actions/gajim-ft_error.png b/icons/hicolor/48x48/status/gajim-ft_error.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-ft_error.png
rename to icons/hicolor/48x48/status/gajim-ft_error.png
diff --git a/icons/hicolor/48x48/actions/gajim-ft_request.png b/icons/hicolor/48x48/status/gajim-ft_request.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-ft_request.png
rename to icons/hicolor/48x48/status/gajim-ft_request.png
diff --git a/icons/hicolor/48x48/actions/gajim-ft_stopped.png b/icons/hicolor/48x48/status/gajim-ft_stopped.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-ft_stopped.png
rename to icons/hicolor/48x48/status/gajim-ft_stopped.png
diff --git a/icons/hicolor/48x48/actions/gajim-gc_invitation.png b/icons/hicolor/48x48/status/gajim-gc_invitation.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-gc_invitation.png
rename to icons/hicolor/48x48/status/gajim-gc_invitation.png
diff --git a/icons/hicolor/48x48/actions/gajim-new_email_recv.png b/icons/hicolor/48x48/status/gajim-new_email_recv.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-new_email_recv.png
rename to icons/hicolor/48x48/status/gajim-new_email_recv.png
diff --git a/icons/hicolor/48x48/actions/gajim-priv_msg_recv.png b/icons/hicolor/48x48/status/gajim-priv_msg_recv.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-priv_msg_recv.png
rename to icons/hicolor/48x48/status/gajim-priv_msg_recv.png
diff --git a/icons/hicolor/48x48/actions/gajim-single_msg_recv.png b/icons/hicolor/48x48/status/gajim-single_msg_recv.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-single_msg_recv.png
rename to icons/hicolor/48x48/status/gajim-single_msg_recv.png
diff --git a/icons/hicolor/48x48/actions/gajim-subscription_request.png b/icons/hicolor/48x48/status/gajim-subscription_request.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-subscription_request.png
rename to icons/hicolor/48x48/status/gajim-subscription_request.png
diff --git a/icons/hicolor/48x48/actions/gajim-unsubscribed.png b/icons/hicolor/48x48/status/gajim-unsubscribed.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-unsubscribed.png
rename to icons/hicolor/48x48/status/gajim-unsubscribed.png
diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index 6229426e1e..20543f46ca 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -171,21 +171,9 @@ class ConversationTextview(gobject.GObject):
FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap(
'gajim-muc_separator')
- XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no',
- quiet=True)
- if not XEP0184_WARNING_PIXBUF:
- MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
- 'gajim-receipt_missing')
- XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes',
- quiet=True)
- if not XEP0184_RECEIVED_PIXBUF:
- MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
- 'gajim-receipt_received')
- MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
- 'gtk-spell-check', quiet=True)
- if not MESSAGE_CORRECTED_PIXBUF:
- MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
- 'gajim-message_corrected')
+ XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no')
+ XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes')
+ MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-spell-check')
# smooth scroll constants
MAX_SCROLL_TIME = 0.4 # seconds
diff --git a/src/dialogs.py b/src/dialogs.py
index c7db7ab003..0aab9be667 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -1311,7 +1311,7 @@ class AboutDialog:
dlg.props.wrap_license = True
- pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-about', 128)
+ pixbuf = gtkgui_helpers.get_icon_pixmap('gajim', 128)
dlg.set_logo(pixbuf)
#here you write your name in the form Name FamilyName <someone@somewhere>
diff --git a/src/gui_interface.py b/src/gui_interface.py
index 81e4e40078..ef50cd5d65 100644
--- a/src/gui_interface.py
+++ b/src/gui_interface.py
@@ -662,7 +662,7 @@ class Interface:
'key.')
dialogs.WarningDialog(_('Your passphrase is incorrect'), sectext)
else:
- path = gtkgui_helpers.get_icon_path('gajim-warning', 48)
+ path = gtkgui_helpers.get_icon_path('gtk-dialog-warning', 48)
account = obj.conn.name
notify.popup('warning', account, account, 'warning', path,
_('OpenPGP Passphrase Incorrect'),
diff --git a/src/htmltextview.py b/src/htmltextview.py
index 25ecf1261d..fbb24ee655 100644
--- a/src/htmltextview.py
+++ b/src/htmltextview.py
@@ -521,7 +521,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
if alt:
alt += '\n'
alt += _('Loading')
- pixbuf = get_icon_pixmap('gajim-receipt_missing')
+ pixbuf = get_icon_pixmap('gtk-no')
if mem:
# Caveat: GdkPixbuf is known not to be safe to load
# images from network... this program is now potentially
diff --git a/src/roster_window.py b/src/roster_window.py
index 61c57a4c5b..14dccd8758 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -6474,6 +6474,11 @@ class RosterWindow:
# Add a Separator (self._iter_is_separator() checks on string SEPARATOR)
liststore.append(['SEPARATOR', None, '', True])
+ path = gtkgui_helpers.get_icon_path('gajim-plugins')
+ img = gtk.Image()
+ img.set_from_file(path)
+ self.xml.get_object('plugins_menuitem').set_image(img)
+
path = gtkgui_helpers.get_icon_path('gajim-kbd_input')
img = gtk.Image()
img.set_from_file(path)
--
GitLab