diff options
Diffstat (limited to 'kopete/plugins')
| -rw-r--r-- | kopete/plugins/history/converter.cpp | 20 | ||||
| -rw-r--r-- | kopete/plugins/webpresence/webpresence_html.xsl | 3 | ||||
| -rw-r--r-- | kopete/plugins/webpresence/webpresence_html_images.xsl | 3 | ||||
| -rw-r--r-- | kopete/plugins/webpresence/webpresence_xhtml.xsl | 3 | ||||
| -rw-r--r-- | kopete/plugins/webpresence/webpresence_xhtml_images.xsl | 3 | ||||
| -rw-r--r-- | kopete/plugins/webpresence/webpresenceprefs.ui | 1 |
6 files changed, 2 insertions, 31 deletions
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::Protocol *>( 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; diff --git a/kopete/plugins/webpresence/webpresence_html.xsl b/kopete/plugins/webpresence/webpresence_html.xsl index e0e55589..e1e8f7cb 100644 --- a/kopete/plugins/webpresence/webpresence_html.xsl +++ b/kopete/plugins/webpresence/webpresence_html.xsl @@ -54,9 +54,6 @@ <xsl:template match="protocol"> <xsl:choose> - <xsl:when test=".='AIMProtocol'"> - <xsl:text>AIM</xsl:text> - </xsl:when> <xsl:when test=".='ICQProtocol'"> <xsl:text>ICQ</xsl:text> </xsl:when> diff --git a/kopete/plugins/webpresence/webpresence_html_images.xsl b/kopete/plugins/webpresence/webpresence_html_images.xsl index bd97657b..ace0c75b 100644 --- a/kopete/plugins/webpresence/webpresence_html_images.xsl +++ b/kopete/plugins/webpresence/webpresence_html_images.xsl @@ -33,9 +33,6 @@ <xsl:when test=".='YahooProtocol'"> <img src="{$images}/yahoo_protocol.png" alt="Yahoo" title="Yahoo"/> </xsl:when> - <xsl:when test=".='AIMProtocol'"> - <img src="{$images}/aim_protocol.png" alt="AIM" title="AIM"/> - </xsl:when> <xsl:when test=".='IRCProtocol'"> <img src="{$images}/irc_protocol.png" alt="IRC" title="IRC"/> </xsl:when> diff --git a/kopete/plugins/webpresence/webpresence_xhtml.xsl b/kopete/plugins/webpresence/webpresence_xhtml.xsl index acec55ee..b50924ab 100644 --- a/kopete/plugins/webpresence/webpresence_xhtml.xsl +++ b/kopete/plugins/webpresence/webpresence_xhtml.xsl @@ -53,9 +53,6 @@ <xsl:template match="protocol"> <xsl:choose> - <xsl:when test=".='AIMProtocol'"> - <xsl:text>AIM</xsl:text> - </xsl:when> <xsl:when test=".='ICQProtocol'"> <xsl:text>ICQ</xsl:text> </xsl:when> diff --git a/kopete/plugins/webpresence/webpresence_xhtml_images.xsl b/kopete/plugins/webpresence/webpresence_xhtml_images.xsl index cf8d0219..9c136171 100644 --- a/kopete/plugins/webpresence/webpresence_xhtml_images.xsl +++ b/kopete/plugins/webpresence/webpresence_xhtml_images.xsl @@ -34,9 +34,6 @@ <xsl:when test=".='YahooProtocol'"> <img src="{$images}/yahoo_protocol.png" alt="Yahoo" title="Yahoo"/> </xsl:when> - <xsl:when test=".='AIMProtocol'"> - <img src="{$images}/aim_protocol.png" alt="AIM" title="AIM"/> - </xsl:when> <xsl:when test=".='IRCProtocol'"> <img src="{$images}/irc_protocol.png" alt="IRC" title="IRC"/> </xsl:when> diff --git a/kopete/plugins/webpresence/webpresenceprefs.ui b/kopete/plugins/webpresence/webpresenceprefs.ui index 89670521..cb78bd36 100644 --- a/kopete/plugins/webpresence/webpresenceprefs.ui +++ b/kopete/plugins/webpresence/webpresenceprefs.ui @@ -212,7 +212,6 @@ The following files are used by default: images/icq_protocol.png images/jabber_protocol.png images/yahoo_protocol.png -images/aim_protocol.png images/irc_protocol.png images/sms_protocol.png images/gadu_protocol.png |