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 02:23:35 +0100 |
commit | 73f00336178a9f312bac2992649120d462e0ac2d (patch) | |
tree | 8672519cb50cb0e642af0817188ad28f810338ee /kopete/protocols/yahoo | |
parent | 914254104c50dec222fb31ce7a25a21870e90f16 (diff) | |
download | tdenetwork-73f00336178a9f312bac2992649120d462e0ac2d.tar.gz tdenetwork-73f00336178a9f312bac2992649120d462e0ac2d.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>
Diffstat (limited to 'kopete/protocols/yahoo')
-rw-r--r-- | kopete/protocols/yahoo/libkyahoo/yabentry.cpp | 3 | ||||
-rw-r--r-- | kopete/protocols/yahoo/libkyahoo/yabentry.h | 1 | ||||
-rw-r--r-- | kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp | 2 | ||||
-rw-r--r-- | kopete/protocols/yahoo/yahoocontact.cpp | 2 | ||||
-rw-r--r-- | kopete/protocols/yahoo/yahooprotocol.cpp | 1 | ||||
-rw-r--r-- | kopete/protocols/yahoo/yahooprotocol.h | 1 |
6 files changed, 10 insertions, 0 deletions
diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp index 4b197b28..9ca9af3d 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp @@ -60,6 +60,7 @@ void YABEntry::fromTQDomElement( const TQDomElement &e ) imGoogleTalk = e.attribute("img"); imICQ = e.attribute("imq"); imIRC = e.attribute("imc"); + imMSN = e.attribute("imm"); imQQ = e.attribute("imqq"); imSkype = e.attribute("imk"); } @@ -109,6 +110,7 @@ void YABEntry::fromTQDomDocument( const TQDomDocument &d ) imGoogleTalk = d.elementsByTagName("img").item(0).toElement().text(); imICQ = d.elementsByTagName("imq").item(0).toElement().text(); imIRC = d.elementsByTagName("imc").item(0).toElement().text(); + imMSN = d.elementsByTagName("imm").item(0).toElement().text(); imQQ = d.elementsByTagName("imqq").item(0).toElement().text(); imSkype = d.elementsByTagName("imk").item(0).toElement().text(); } @@ -155,6 +157,7 @@ void YABEntry::fillTQDomElement( TQDomElement &e ) const e.setAttribute( "img", imGoogleTalk ); e.setAttribute( "imq", imICQ ); e.setAttribute( "imc", imIRC ); + e.setAttribute( "imm", imMSN ); e.setAttribute( "imqq", imQQ ); e.setAttribute( "imk", imSkype ); } diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.h b/kopete/protocols/yahoo/libkyahoo/yabentry.h index bcb2bce9..14cacef8 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabentry.h +++ b/kopete/protocols/yahoo/libkyahoo/yabentry.h @@ -46,6 +46,7 @@ struct YABEntry TQString altEmail2; TQString imAIM; TQString imICQ; + TQString imMSN; TQString imGoogleTalk; TQString imSkype; TQString imIRC; diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index 8164bae3..f98b80a4 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -120,6 +120,7 @@ void YahooUserInfoDialog::slotSaveAndCloseClicked() // entry.imGoogleTalk = m_genInfoWidget->firstNameEdit->text(); // entry.imICQ = m_genInfoWidget->firstNameEdit->text(); // entry.imIRC = m_genInfoWidget->firstNameEdit->text(); +// entry.imMSN = m_genInfoWidget->firstNameEdit->text(); // entry.imQQ = m_genInfoWidget->firstNameEdit->text(); // entry.imSkype = m_genInfoWidget->firstNameEdit->text(); @@ -190,6 +191,7 @@ void YahooUserInfoDialog::slotUser2() // entry.imGoogleTalk = m_genInfoWidget->firstNameEdit->text().isEmpty() ? oldEntry->notes : m_otherInfoWidget->commentsEdit->text(); // entry.imICQ = m_genInfoWidget->firstNameEdit->text().isEmpty() ? oldEntry->notes : m_otherInfoWidget->commentsEdit->text(); // entry.imIRC = m_genInfoWidget->firstNameEdit->text().isEmpty() ? oldEntry->notes : m_otherInfoWidget->commentsEdit->text(); + // entry.imMSN = m_genInfoWidget->firstNameEdit->text().isEmpty() ? oldEntry->notes : m_otherInfoWidget->commentsEdit->text(); // entry.imQQ = m_genInfoWidget->firstNameEdit->text().isEmpty() ? oldEntry->notes : m_otherInfoWidget->commentsEdit->text(); // entry.imSkype = m_genInfoWidget->firstNameEdit->text().isEmpty() ? oldEntry->notes : m_otherInfoWidget->commentsEdit->text(); diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index 8d9c5b00..86f89076 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -737,6 +737,7 @@ void YahooContact::writeYABEntry() setProperty( YahooProtocol::protocol()->propAltEmail2, m_YABEntry->altEmail2 ); setProperty( YahooProtocol::protocol()->propImAIM, m_YABEntry->imAIM ); setProperty( YahooProtocol::protocol()->propImICQ, m_YABEntry->imICQ ); + setProperty( YahooProtocol::protocol()->propImMSN, m_YABEntry->imMSN ); setProperty( YahooProtocol::protocol()->propImGoogleTalk, m_YABEntry->imGoogleTalk ); setProperty( YahooProtocol::protocol()->propImSkype, m_YABEntry->imSkype ); setProperty( YahooProtocol::protocol()->propImIRC, m_YABEntry->imIRC ); @@ -799,6 +800,7 @@ void YahooContact::readYABEntry() m_YABEntry->altEmail2 = property( YahooProtocol::protocol()->propAltEmail2 ).value().toString(); m_YABEntry->imAIM = property( YahooProtocol::protocol()->propImAIM ).value().toString(); m_YABEntry->imICQ = property( YahooProtocol::protocol()->propImICQ ).value().toString(); + m_YABEntry->imMSN = property( YahooProtocol::protocol()->propImMSN ).value().toString(); m_YABEntry->imGoogleTalk = property( YahooProtocol::protocol()->propImGoogleTalk ).value().toString(); m_YABEntry->imSkype = property( YahooProtocol::protocol()->propImSkype ).value().toString(); m_YABEntry->imIRC = property( YahooProtocol::protocol()->propImIRC ).value().toString(); diff --git a/kopete/protocols/yahoo/yahooprotocol.cpp b/kopete/protocols/yahoo/yahooprotocol.cpp index 6b0328d6..6197aa86 100644 --- a/kopete/protocols/yahoo/yahooprotocol.cpp +++ b/kopete/protocols/yahoo/yahooprotocol.cpp @@ -73,6 +73,7 @@ YahooProtocol::YahooProtocol( TQObject *parent, const char *name, const TQString propAltEmail2("YABAlternativeEmail2", i18n("Alternative email 1"), TQString(), true, false), propImAIM("YABIMAIM", i18n("AIM"), TQString(), true, false), propImICQ("YABIMICQ", i18n("ICQ"), TQString(), true, false), + propImMSN("YABIMMSN", i18n("MSN"), TQString(), true, false), propImGoogleTalk("YABIMGoogleTalk", i18n("GoogleTalk"), TQString(), true, false), propImSkype("YABIMSkype", i18n("Skype"), TQString(), true, false), propImIRC("YABIMIRC", i18n("IRC"), TQString(), true, false), diff --git a/kopete/protocols/yahoo/yahooprotocol.h b/kopete/protocols/yahoo/yahooprotocol.h index 4370e69f..075b84db 100644 --- a/kopete/protocols/yahoo/yahooprotocol.h +++ b/kopete/protocols/yahoo/yahooprotocol.h @@ -89,6 +89,7 @@ public: const Kopete::ContactPropertyTmpl propAltEmail2; const Kopete::ContactPropertyTmpl propImAIM; const Kopete::ContactPropertyTmpl propImICQ; + const Kopete::ContactPropertyTmpl propImMSN; const Kopete::ContactPropertyTmpl propImGoogleTalk; const Kopete::ContactPropertyTmpl propImSkype; const Kopete::ContactPropertyTmpl propImIRC; |