kopete: Restore the AIM protocol because a replacement AIM server was created.

This reverts commits 036b0229db and dc34f9c391.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

6 files changed, 29 insertions, 0 deletions

diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp
index 44b41fe9..a3c6580a 100644
--- a/kopete/plugins/history/converter.cpp
+++ b/kopete/plugins/history/converter.cpp
@@ -74,6 +74,18 @@ void HistoryPlugin::convertOldHistory()
 				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";
@@ -309,6 +321,10 @@ bool HistoryPlugin::detectOldHistory()
 
 		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" )
+			return true;
 		else if(fi->fileName() == "JabberProtocol" || fi->fileName() == "jabber_logs")
 			return true;
 		++it;
diff --git a/kopete/plugins/webpresence/webpresence_html.xsl b/kopete/plugins/webpresence/webpresence_html.xsl
index e1e8f7cb..e0e55589 100644
--- a/kopete/plugins/webpresence/webpresence_html.xsl
+++ b/kopete/plugins/webpresence/webpresence_html.xsl
@@ -54,6 +54,9 @@
 
 	<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 ace0c75b..bd97657b 100644
--- a/kopete/plugins/webpresence/webpresence_html_images.xsl
+++ b/kopete/plugins/webpresence/webpresence_html_images.xsl
@@ -33,6 +33,9 @@
 			<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 b50924ab..acec55ee 100644
--- a/kopete/plugins/webpresence/webpresence_xhtml.xsl
+++ b/kopete/plugins/webpresence/webpresence_xhtml.xsl
@@ -53,6 +53,9 @@
 
 	<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 9c136171..cf8d0219 100644
--- a/kopete/plugins/webpresence/webpresence_xhtml_images.xsl
+++ b/kopete/plugins/webpresence/webpresence_xhtml_images.xsl
@@ -34,6 +34,9 @@
 			<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 b075195c..479f128e 100644
--- a/kopete/plugins/webpresence/webpresenceprefs.ui
+++ b/kopete/plugins/webpresence/webpresenceprefs.ui
@@ -212,6 +212,7 @@ 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