From dc34f9c39105b0fe20ba45c064a08406084acbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 30 Dec 2017 15:57:14 +0100 Subject: kopete: Remove AIM protocol AIM network has been shutdown in 2017-12-15 This resolves Bug 2846 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- kopete/plugins/history/converter.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'kopete/plugins/history/converter.cpp') diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp index 4285309c..44b41fe9 100644 --- a/kopete/plugins/history/converter.cpp +++ b/kopete/plugins/history/converter.cpp @@ -68,24 +68,12 @@ void HistoryPlugin::convertOldHistory() if(accountId.isNull() || protocolId.isNull()) { - if(fi->fileName() == "ICQProtocol" || fi->fileName() == "icq_logs" ) + if(fi->fileName() == "ICQProtocol" || fi->fileName() == "icq_logs" ) { protocolId="ICQProtocol"; TDEGlobal::config()->setGroup("ICQ"); accountId=TDEGlobal::config()->readEntry( "UIN" ); } - else if(fi->fileName() == "AIMProtocol" || fi->fileName() == "aim_logs" ) - { - protocolId="AIMProtocol"; - TDEGlobal::config()->setGroup("AIM"); - accountId=TDEGlobal::config()->readEntry( "UserID" ); - } - else if(fi->fileName() == "OscarProtocol" ) - { - protocolId="AIMProtocol"; - TDEGlobal::config()->setGroup("OSCAR"); - accountId=TDEGlobal::config()->readEntry( "UserID" ); - } else if(fi->fileName() == "JabberProtocol" || fi->fileName() == "jabber_logs") { protocolId="JabberProtocol"; @@ -319,11 +307,7 @@ bool HistoryPlugin::detectOldHistory() if( dynamic_cast( Kopete::PluginManager::self()->plugin( fi->fileName() ) ) ) return true; - if(fi->fileName() == "ICQProtocol" || fi->fileName() == "icq_logs" ) - return true; - else if(fi->fileName() == "AIMProtocol" || fi->fileName() == "aim_logs" ) - return true; - else if(fi->fileName() == "OscarProtocol" ) + if(fi->fileName() == "ICQProtocol" || fi->fileName() == "icq_logs" ) return true; else if(fi->fileName() == "JabberProtocol" || fi->fileName() == "jabber_logs") return true; -- cgit v1.2.3