diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2019-12-11 01:41:26 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2019-12-11 19:36:33 +0100 |
commit | 7542bb6bd597400167da57dc43dd37ff85a6e173 (patch) | |
tree | c8ba8ffc7ff08af3f3f3478f6ee98bf0fd5b7bb1 /kopete/plugins/webpresence | |
parent | fac887803df710a5ca534e0b79a5a274461e6697 (diff) | |
download | tdenetwork-7542bb6bd597400167da57dc43dd37ff85a6e173.tar.gz tdenetwork-7542bb6bd597400167da57dc43dd37ff85a6e173.zip |
kopete: Restore the MSN protocol because a replacement MSN server was created.
This reverts commits 0486034738 - 2d5f9c55da and f6fd4ab6c0.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 73f00336178a9f312bac2992649120d462e0ac2d)
Diffstat (limited to 'kopete/plugins/webpresence')
5 files changed, 15 insertions, 2 deletions
diff --git a/kopete/plugins/webpresence/webpresence_html.xsl b/kopete/plugins/webpresence/webpresence_html.xsl index e0e55589..f768ccf5 100644 --- a/kopete/plugins/webpresence/webpresence_html.xsl +++ b/kopete/plugins/webpresence/webpresence_html.xsl @@ -57,6 +57,9 @@ <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 bd97657b..5b707046 100644 --- a/kopete/plugins/webpresence/webpresence_html_images.xsl +++ b/kopete/plugins/webpresence/webpresence_html_images.xsl @@ -24,6 +24,9 @@ <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 acec55ee..9d749c14 100644 --- a/kopete/plugins/webpresence/webpresence_xhtml.xsl +++ b/kopete/plugins/webpresence/webpresence_xhtml.xsl @@ -56,6 +56,9 @@ <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 cf8d0219..8254a674 100644 --- a/kopete/plugins/webpresence/webpresence_xhtml_images.xsl +++ b/kopete/plugins/webpresence/webpresence_xhtml_images.xsl @@ -25,6 +25,9 @@ <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 479f128e..dfe781f1 100644 --- a/kopete/plugins/webpresence/webpresenceprefs.ui +++ b/kopete/plugins/webpresence/webpresenceprefs.ui @@ -200,15 +200,16 @@ Note that some web browsers do not support XHTML. You should also make sure your <string>Repla&ce protocol text with images in (X)HTML</string> </property> <property name="toolTip" stdset="0"> - <string>Replaces the protocol names, such as IRC with images.</string> + <string>Replaces the protocol names, such as MSN and IRC with images.</string> </property> <property name="whatsThis" stdset="0"> - <string>Replaces the protocol names, such as IRC with images. + <string>Replaces the protocol names, such as MSN and 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 |