From 0486034738b850c210b1389a8c3ae51a6b9fad23 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 29 Mar 2014 00:54:51 +0900
Subject: Removed MSN support across Kopete by removing the MSN protocol and
 the netmeeting plugin. This resolves bug 1547.

---
 kopete/plugins/webpresence/webpresence_html.xsl         | 3 ---
 kopete/plugins/webpresence/webpresence_html_images.xsl  | 3 ---
 kopete/plugins/webpresence/webpresence_xhtml.xsl        | 3 ---
 kopete/plugins/webpresence/webpresence_xhtml_images.xsl | 3 ---
 kopete/plugins/webpresence/webpresenceprefs.ui          | 5 ++---
 5 files changed, 2 insertions(+), 15 deletions(-)

(limited to 'kopete/plugins/webpresence')

diff --git a/kopete/plugins/webpresence/webpresence_html.xsl b/kopete/plugins/webpresence/webpresence_html.xsl
index f768ccf5..e0e55589 100644
--- a/kopete/plugins/webpresence/webpresence_html.xsl
+++ b/kopete/plugins/webpresence/webpresence_html.xsl
@@ -57,9 +57,6 @@
 			<xsl:when test=".='AIMProtocol'">
 				<xsl:text>AIM</xsl:text>
 			</xsl:when>
-			<xsl:when test=".='MSNProtocol'">
-				<xsl:text>MSN</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 5b707046..bd97657b 100644
--- a/kopete/plugins/webpresence/webpresence_html_images.xsl
+++ b/kopete/plugins/webpresence/webpresence_html_images.xsl
@@ -24,9 +24,6 @@
 
 	<xsl:template match="protocol">
 		<xsl:choose>
-			<xsl:when test=".='MSNProtocol'">
-				<img src="{$images}/msn_protocol.png" alt="MSN" title="MSN"/>
-			</xsl:when>
 			<xsl:when test=".='ICQProtocol'">
 				<img src="{$images}/icq_protocol.png" alt="ICQ" title="ICQ"/>
 			</xsl:when>
diff --git a/kopete/plugins/webpresence/webpresence_xhtml.xsl b/kopete/plugins/webpresence/webpresence_xhtml.xsl
index 9d749c14..acec55ee 100644
--- a/kopete/plugins/webpresence/webpresence_xhtml.xsl
+++ b/kopete/plugins/webpresence/webpresence_xhtml.xsl
@@ -56,9 +56,6 @@
 			<xsl:when test=".='AIMProtocol'">
 				<xsl:text>AIM</xsl:text>
 			</xsl:when>
-			<xsl:when test=".='MSNProtocol'">
-				<xsl:text>MSN</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 8254a674..cf8d0219 100644
--- a/kopete/plugins/webpresence/webpresence_xhtml_images.xsl
+++ b/kopete/plugins/webpresence/webpresence_xhtml_images.xsl
@@ -25,9 +25,6 @@
 
 	<xsl:template match="protocol">
 		<xsl:choose>
-			<xsl:when test=".='MSNProtocol'">
-				<img src="{$images}/msn_protocol.png" alt="MSN" title="MSN"/>
-			</xsl:when>
 			<xsl:when test=".='ICQProtocol'">
 				<img src="{$images}/icq_protocol.png" alt="ICQ" title="ICQ"/>
 			</xsl:when>
diff --git a/kopete/plugins/webpresence/webpresenceprefs.ui b/kopete/plugins/webpresence/webpresenceprefs.ui
index 0a676973..89670521 100644
--- a/kopete/plugins/webpresence/webpresenceprefs.ui
+++ b/kopete/plugins/webpresence/webpresenceprefs.ui
@@ -200,16 +200,15 @@ Note that some web browsers do not support XHTML. You should also make sure your
                         <string>Repla&amp;ce protocol text with images in (X)HTML</string>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>Replaces the protocol names, such as MSN and IRC with images.</string>
+                        <string>Replaces the protocol names, such as IRC with images.</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>Replaces the protocol names, such as MSN and IRC with images.
+                        <string>Replaces the protocol names, such as IRC with images.
 
 Note that you have to manually copy the PNG files into place.
 
 The following files are used by default:
 
-images/msn_protocol.png
 images/icq_protocol.png
 images/jabber_protocol.png
 images/yahoo_protocol.png
-- 
cgit v1.2.1