diff options
| author | Michele Calgaro <[email protected]> | 2014-03-29 00:54:51 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2014-03-29 00:54:51 +0900 |
| commit | 0486034738b850c210b1389a8c3ae51a6b9fad23 (patch) | |
| tree | b1e3a4dbf9673b5e0031e8225e88f5dd490585a5 /kopete/protocols/jabber | |
| parent | 4bd7620e88d450995b78c201f9e7d9181f62ea6a (diff) | |
| download | tdenetwork-0486034738b850c210b1389a8c3ae51a6b9fad23.tar.gz tdenetwork-0486034738b850c210b1389a8c3ae51a6b9fad23.zip | |
Removed MSN support across Kopete by removing the MSN protocol and the netmeeting plugin.
This resolves bug 1547.
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, 2 insertions, 4 deletions
diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index e503008e..51ad4581 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -54,9 +54,7 @@ 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=="msn") - cIcon="jabber_gateway_msn"; - else if(gateway_type=="icq") + 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 83f5e502..21fa208d 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: "msn" or "icq" only used when the account is not loaded from config file for determining the icon + * @param gateway_type eg: "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()); |