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/plugins/history | |
| 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/plugins/history')
| -rw-r--r-- | kopete/plugins/history/converter.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp index ca3c2e74..0872e906 100644 --- a/kopete/plugins/history/converter.cpp +++ b/kopete/plugins/history/converter.cpp @@ -68,13 +68,7 @@ void HistoryPlugin::convertOldHistory() if(accountId.isNull() || protocolId.isNull()) { - if(fi->fileName() == "MSNProtocol" || fi->fileName() == "msn_logs" ) - { - protocolId="MSNProtocol"; - TDEGlobal::config()->setGroup("MSN"); - accountId=TDEGlobal::config()->readEntry( "UserID" ); - } - else if(fi->fileName() == "ICTQProtocol" || fi->fileName() == "icq_logs" ) + if(fi->fileName() == "ICTQProtocol" || fi->fileName() == "icq_logs" ) { protocolId="ICTQProtocol"; TDEGlobal::config()->setGroup("ICQ"); @@ -325,9 +319,7 @@ bool HistoryPlugin::detectOldHistory() if( dynamic_cast<Kopete::Protocol *>( Kopete::PluginManager::self()->plugin( fi->fileName() ) ) ) return true; - if(fi->fileName() == "MSNProtocol" || fi->fileName() == "msn_logs" ) - return true; - else if(fi->fileName() == "ICTQProtocol" || fi->fileName() == "icq_logs" ) + if(fi->fileName() == "ICTQProtocol" || fi->fileName() == "icq_logs" ) return true; else if(fi->fileName() == "AIMProtocol" || fi->fileName() == "aim_logs" ) return true; |