From d656428090186edabb54ea92bda11b39426c17ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Thu, 31 May 2018 20:27:53 +0200 Subject: [PATCH] Remove MSN related transport code/icons This Messenger shut down and is not available anymore --- gajim/common/app.py | 4 +- .../scalable/status/gajim-agent-msn.svg | 168 ------------------ .../iconsets/transports/msn/16x16/away.png | Bin 775 -> 0 bytes .../iconsets/transports/msn/16x16/chat.png | Bin 864 -> 0 bytes .../iconsets/transports/msn/16x16/dnd.png | Bin 768 -> 0 bytes .../transports/msn/16x16/not_in_roster.png | Bin 754 -> 0 bytes .../iconsets/transports/msn/16x16/offline.png | Bin 744 -> 0 bytes .../iconsets/transports/msn/16x16/online.png | Bin 805 -> 0 bytes .../data/iconsets/transports/msn/16x16/xa.png | Bin 768 -> 0 bytes .../iconsets/transports/msn/32x32/away.png | Bin 1791 -> 0 bytes .../iconsets/transports/msn/32x32/chat.png | Bin 2054 -> 0 bytes .../iconsets/transports/msn/32x32/dnd.png | Bin 1879 -> 0 bytes .../transports/msn/32x32/not_in_roster.png | Bin 1831 -> 0 bytes .../iconsets/transports/msn/32x32/offline.png | Bin 1829 -> 0 bytes .../iconsets/transports/msn/32x32/online.png | Bin 1812 -> 0 bytes .../data/iconsets/transports/msn/32x32/xa.png | Bin 1760 -> 0 bytes .../iconsets/transports/msn/48x48/offline.png | Bin 2999 -> 0 bytes .../iconsets/transports/msn/48x48/online.png | Bin 2994 -> 0 bytes gajim/dialogs.py | 3 +- gajim/disco.py | 2 - 20 files changed, 3 insertions(+), 174 deletions(-) delete mode 100644 gajim/data/icons/hicolor/scalable/status/gajim-agent-msn.svg delete mode 100644 gajim/data/iconsets/transports/msn/16x16/away.png delete mode 100644 gajim/data/iconsets/transports/msn/16x16/chat.png delete mode 100644 gajim/data/iconsets/transports/msn/16x16/dnd.png delete mode 100644 gajim/data/iconsets/transports/msn/16x16/not_in_roster.png delete mode 100644 gajim/data/iconsets/transports/msn/16x16/offline.png delete mode 100644 gajim/data/iconsets/transports/msn/16x16/online.png delete mode 100644 gajim/data/iconsets/transports/msn/16x16/xa.png delete mode 100644 gajim/data/iconsets/transports/msn/32x32/away.png delete mode 100644 gajim/data/iconsets/transports/msn/32x32/chat.png delete mode 100644 gajim/data/iconsets/transports/msn/32x32/dnd.png delete mode 100644 gajim/data/iconsets/transports/msn/32x32/not_in_roster.png delete mode 100644 gajim/data/iconsets/transports/msn/32x32/offline.png delete mode 100644 gajim/data/iconsets/transports/msn/32x32/online.png delete mode 100644 gajim/data/iconsets/transports/msn/32x32/xa.png delete mode 100644 gajim/data/iconsets/transports/msn/48x48/offline.png delete mode 100644 gajim/data/iconsets/transports/msn/48x48/online.png diff --git a/gajim/common/app.py b/gajim/common/app.py index 7f355b8dd..364e635be 100644 --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -448,7 +448,7 @@ def get_transport_name_from_jid(jid, use_config_setting = True): # now we support both 'icq.' and 'icq' but not icqsucks.org host = host_splitted[0] - if host in ('irc', 'icq', 'msn', 'sms', 'tlen', 'weather', 'yahoo', + if host in ('irc', 'icq', 'sms', 'tlen', 'weather', 'yahoo', 'mrim', 'facebook'): return host elif host == 'gg': @@ -504,7 +504,7 @@ def get_notification_image_prefix(jid): Returns the prefix for the notification images """ transport_name = get_transport_name_from_jid(jid) - if transport_name in ('icq', 'msn', 'yahoo', 'facebook'): + if transport_name in ('icq', 'yahoo', 'facebook'): prefix = transport_name else: prefix = 'jabber' diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-msn.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-msn.svg deleted file mode 100644 index 36f88fbc9..000000000 --- a/gajim/data/icons/hicolor/scalable/status/gajim-agent-msn.svg +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/gajim/data/iconsets/transports/msn/16x16/away.png b/gajim/data/iconsets/transports/msn/16x16/away.png deleted file mode 100644 index 1f278893b61282b36abf6d9ebbfdd89d76bac28d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 775 zcmV+i1Ni)jP)Ajbl`dafY50t9n6D>ASf7>7=2O^HY$ipMVCx$>NcltzI)&2xjT?R#YpHr zy)Ul&<44Sl|0&~djYyDAODTG_)_x&GR4IKU5aNfcIa+IjNRV3GC6&+p$1ZsCDjHz@ z97Oc#{cLVFemD@~_sdza)^urzD^(}EO|xt(DESp;aVaVfcA7$pYpdBc1?2La^KPyq zEKURN0&r>s1=WqjK*zcS(Dt;pGhk?7aR%hhhqmS+2#IwGv{IpoCwH<`ydB8Rg39+| z;@RB{GeZ9qM1r&dfG<5XD08Vvz)piT!=6tQ0DmM%=8AKdrw|EJvykF(al@|sindE` z%1%H>2S6KZflaN5zYAMaANr%(QO5%z9$g`b1nHD8jC(ch7rpuQt>D;8aB>K&6`&MY z=0o_8Vqx-^9(#0qN-Nb62yud#8Id6Ely38FU007c&lJ$(1Av_Ym;tQ-t-wklXK9!_ zI*}TW*|CAXH(K!#d1mCMDGd3#rsHy{+hvjUBaFpt7I}gJR$#4{Buc@u9OUBPP*{IJ zIu4aD#-k8Iid(+s6BXXF3W8C9@5X+3yhUKg0Xq)hIDlFbcwE4g*aDp#hOeo`LxigW z%;!sXA9AxWu@H;$!uN=6)Sq2?oKXNU09PSUR14V{gk$>Iq7qm$F%V(i03oq3_Nho` z5*&LKP8SkQjECp8mF{WtxP1E{y@gPjS=gyKre8eB=7zrvjS}XVQKdC^)5k6}2}ykf ziYcXg01Ok+bs?#p8P%+H84)E(&}Xf5KQnp*A-4ZS{~IzCGxOZ0Kg;kplzo5;)h^m5s%dzEEe&!=JIzbl+7~*}Z4m8oju17UD?;kIRAPrW##U>Art* zuxRU<&#lLr^Al+k)>IZF;UUP`DB`gQ3|)PY%jMdH5FLjP9{DhB2Aq>bCTHenk_kj! zbfKZH0mVftU>F9n+3d>jhv8+nZr=!;Jav5Cv;wASUTVGCd&pOwHMVTpjDmtf-0iso z&N%>J-I@l)Zg(hG+Ap8~L%{0~%v2QWd=ea%mpLVPJO$vKW9_Q?9~dD7+%7jP%c`Ki zk*g_{Z`Ld>&uea~R^Pqq!%%1lWu;}mIPk4*z~GzLT#}?mKSK2S1AbMZ?Yp+u+m=*# z5FGx5=vW+%bU&&pE3vw^7K9Ld{5Xc^!Jz2xf0D2)vx)q!`^jJxG}v;u+0q>n1^FN@4lpBVAWj<=(y>^|Ps}k-k@>NTt)T z1Oa0f7_*RXMGzhtLtn&(;nWN)U05!ejJd+maUm&`o^4#az*FdU5GoV6m2uc~1Cx^` zCa1n`h?U`f)P)H#6M0ew?_(*{EG{=d$X-c6Z1pXlugL)3grdBEU^KU)!U?Bc1C;>A zOvqG)+hJh+k~x@_rwCoL5RQEUfD{D~fA)IB{y9AuU8TF@(tN#K*T}@KK^OH^h0000-g diff --git a/gajim/data/iconsets/transports/msn/16x16/dnd.png b/gajim/data/iconsets/transports/msn/16x16/dnd.png deleted file mode 100644 index c60153a12f1652e16edacaf3a39eae290dc37bdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmV+b1ONPqP)L(Mw2FQ5**F@0|OZJ2N(E z>3DUf(H~Gxywk?r9fVMneDX|Kqp#KHxu({OwUv*Stq_sS(TOAw`x3%`7`R@bvtn z1p&+Inm4ZqzJLT^8s$RtL4<;8jq&y7)oRz zX&R0lsPQOn<;L&Xc>z_XW%+qtFz!HCB}`0P2>5+)xKp+uz_xhGWHz`XFlE}%6pERQ z1preE1B7U~{os{Z=+j_Y4p#WRxOumONtCqy6A0|MnkO7l(fOuNOQbR|Ee>XJjQ$u` zZAa9Eb~G8Y^K(`Rg`3tXRCyMzuJnehE7Y+xLr-)PhB=P4cdmfE?u0WlBLpSSJ!a-$ zB@p`sl(B}?XXk!2PrGXeVNScFn!WlfPe=k*)b1m$$r#&B#*bbXBSeY;o7@A}6O zPfR0LS^@u-t;q8iz!@0 yAqXMoXD99BAMVq#*#tD`>T~zW@LNlu1NER5*>L(MeBJQ4|O8|Gn>ZpcRPH z(iRiIAt3=l+Ja1xL_owChZutvA*@^(*M0`~vLk)~qKF2G;+6;sm4ZfaK&A$ew57Cm zc<;V@uM03C5hICbcXIyccNPcu&mw;tRQk_cQxy6@N>M@xS>{~c{}6mPbReL*rl!g5 zDS8#?ykU1bomg2}!N8NDR5TLnmz-qOWISLA37zXlk^AL$faJ0w`LTTB70H(79GZ=*ANF)_^Mm`UbRY7U^^vsZ_=ci8jCA z@7bGI_BK`idY=kRHZ{~%_I3x9STusqU*?faCehy3iv0Xs*SDqBo&s0l(B}I37O>}y zr)uiXTTJR;SLb!R+wCILp%9|62!s&eoP!VrjrEP#P9){PuoAh&19_m_N~L)iEWHe zjDs--5VEt(1-K9pT!1kH3*Q#t^LZ&HG%vjILs8ttMUUEBTdJ)&7HYTIkYmk(rs>FP z8n_VPyND11gitt~4ltdes@^cigMLzwjdr)$gc}aqWNqy3SBNp0dUS? zHe29vdvNhW2TF@eWr4$ia5xMpp{taV_3w*|CCp%QWaPEZ1&7I`3Saf%UPZabMf`kx&&D! kQVhb-`$C~m{P*{M0ct8fMy2ag_y7O^07*qoM6N<$g3sJofdBvi diff --git a/gajim/data/iconsets/transports/msn/16x16/offline.png b/gajim/data/iconsets/transports/msn/16x16/offline.png deleted file mode 100644 index f9d0c68484228c99cdbb6873ab4ff8491db71c8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 744 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 diff --git a/gajim/data/iconsets/transports/msn/32x32/dnd.png b/gajim/data/iconsets/transports/msn/32x32/dnd.png deleted file mode 100644 index f967ce6f90402cb9a7326e4c9c092a1c11e28bf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1879 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 VM2H;B0~r7S002ovPDHLkV1jFHXfyx- diff --git a/gajim/data/iconsets/transports/msn/32x32/offline.png b/gajim/data/iconsets/transports/msn/32x32/offline.png deleted file mode 100644 index 83ac0529b4cee8303ce85778105838c4e764ea4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1829 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 t4Dnpr`)mlBb)7Cg`}&Umcj5vm>2*6 diff --git a/gajim/data/iconsets/transports/msn/48x48/online.png b/gajim/data/iconsets/transports/msn/48x48/online.png deleted file mode 100644 index 3a5a199d3f689a61106be6d829a7cf788689a059..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2994 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 diff --git a/gajim/dialogs.py b/gajim/dialogs.py index f17a20627..fbca30f4e 100644 --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -852,7 +852,6 @@ class AddNewContactWindow: uid_labels = {'jabber': _('JID:'), 'gadu-gadu': _('GG Number:'), 'icq': _('ICQ Number:'), - 'msn': _('MSN Address:'), 'yahoo': _('Yahoo! Address:')} def __init__(self, account=None, jid=None, user_nick=None, group=None): @@ -934,7 +933,7 @@ class AddNewContactWindow: self.protocol_combobox.add_attribute(cell, 'text', 0) self.protocol_combobox.set_model(liststore) uf_type = {'jabber': 'XMPP', 'gadu-gadu': 'Gadu Gadu', - 'icq': 'ICQ', 'msn': 'MSN', 'yahoo': 'Yahoo'} + 'icq': 'ICQ', 'yahoo': 'Yahoo'} # Jabber as first liststore.append(['XMPP', 'xmpp', 'jabber']) for type_ in self.agents: diff --git a/gajim/disco.py b/gajim/disco.py index fafa647c6..78bd47fd9 100644 --- a/gajim/disco.py +++ b/gajim/disco.py @@ -106,8 +106,6 @@ def _gen_agent_type_info(): ('gateway', 'http-ws'): (False, 'http-ws'), ('gateway', 'icq'): (False, 'icq'), ('_jid', 'icq'): (False, 'icq'), - ('gateway', 'msn'): (False, 'msn'), - ('_jid', 'msn'): (False, 'msn'), ('gateway', 'sms'): (False, 'sms'), ('_jid', 'sms'): (False, 'sms'), ('gateway', 'smtp'): (False, 'mail'),