Removed MSN support across Kopete by removing the MSN protocol and the netmeeting plugin.

This resolves bug 1547.

6 files changed, 0 insertions, 10 deletions

diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
index 9ca9af3d..4b197b28 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
@@ -60,7 +60,6 @@ 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");
 }
@@ -110,7 +109,6 @@ 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();
 }
@@ -157,7 +155,6 @@ 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 14cacef8..bcb2bce9 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabentry.h
+++ b/kopete/protocols/yahoo/libkyahoo/yabentry.h
@@ -46,7 +46,6 @@ 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 f98b80a4..8164bae3 100644
--- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
+++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
@@ -120,7 +120,6 @@ 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();
 		
@@ -191,7 +190,6 @@ 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 86f89076..8d9c5b00 100644
--- a/kopete/protocols/yahoo/yahoocontact.cpp
+++ b/kopete/protocols/yahoo/yahoocontact.cpp
@@ -737,7 +737,6 @@ 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 );
@@ -800,7 +799,6 @@ 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 6197aa86..6b0328d6 100644
--- a/kopete/protocols/yahoo/yahooprotocol.cpp
+++ b/kopete/protocols/yahoo/yahooprotocol.cpp
@@ -73,7 +73,6 @@ 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 075b84db..4370e69f 100644
--- a/kopete/protocols/yahoo/yahooprotocol.h
+++ b/kopete/protocols/yahoo/yahooprotocol.h
@@ -89,7 +89,6 @@ 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;