diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-12-11 01:41:26 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-12-11 19:36:33 +0100 |
| commit | 7542bb6bd597400167da57dc43dd37ff85a6e173 (patch) | |
| tree | c8ba8ffc7ff08af3f3f3478f6ee98bf0fd5b7bb1 /kopete/protocols/jabber | |
| parent | fac887803df710a5ca534e0b79a5a274461e6697 (diff) | |
| download | tdenetwork-7542bb6bd597400167da57dc43dd37ff85a6e173.tar.gz tdenetwork-7542bb6bd597400167da57dc43dd37ff85a6e173.zip | |
kopete: Restore the MSN protocol because a replacement MSN server was created.
This reverts commits 0486034738 - 2d5f9c55da and f6fd4ab6c0.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 73f00336178a9f312bac2992649120d462e0ac2d)
Diffstat (limited to 'kopete/protocols/jabber')
| -rw-r--r-- | kopete/protocols/jabber/jabbertransport.cpp | 4 | ||||
| -rw-r--r-- | kopete/protocols/jabber/jabbertransport.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index be962fad..d0c59e3a 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -54,7 +54,9 @@ JabberTransport::JabberTransport (JabberAccount * parentAccount, const XMPP::Ros #if KOPETE_IS_VERSION(0,11,51) //setCustomIcon is new in kopete 0.12 TQString cIcon; - if(gateway_type=="icq") + if(gateway_type=="msn") + cIcon="jabber_gateway_msn"; + else if(gateway_type=="icq") cIcon="jabber_gateway_icq"; else if(gateway_type=="aim") cIcon="jabber_gateway_aim"; diff --git a/kopete/protocols/jabber/jabbertransport.h b/kopete/protocols/jabber/jabbertransport.h index 21fa208d..83f5e502 100644 --- a/kopete/protocols/jabber/jabbertransport.h +++ b/kopete/protocols/jabber/jabbertransport.h @@ -47,7 +47,7 @@ public: * constructor called when the transport is created by info from server (i.e not when loading kopete) * @param parentAccount is the parent jabber account. * @param item is the roster item of the gateway - * @param gateway_type eg: "icq" only used when the account is not loaded from config file for determining the icon + * @param gateway_type eg: "msn" or "icq" only used when the account is not loaded from config file for determining the icon */ JabberTransport (JabberAccount * parentAccount, const XMPP::RosterItem &item, const TQString& gateway_type=TQString()); |