6 files changed, 0 insertions, 10 deletions

diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
index 4b197b28..bcd067c4 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
@@ -56,7 +56,6 @@ void YABEntry::fromTQDomElement( const TQDomElement &e )
 	additional3 = e.attribute("c3");
 	additional4 = e.attribute("c4");
 	notes = e.attribute("cm").replace( "
", "\n" );
-	imAIM = e.attribute("ima");
 	imGoogleTalk = e.attribute("img");
 	imICQ = e.attribute("imq");
 	imIRC = e.attribute("imc");
@@ -105,7 +104,6 @@ void YABEntry::fromTQDomDocument( const TQDomDocument &d )
 	additional3 = d.elementsByTagName("c3").item(0).toElement().text();
 	additional4 = d.elementsByTagName("c4").item(0).toElement().text();
 	notes = d.elementsByTagName("cm").item(0).toElement().text().replace( "
", "\n" );
-	imAIM = d.elementsByTagName("ima").item(0).toElement().text();
 	imGoogleTalk = d.elementsByTagName("img").item(0).toElement().text();
 	imICQ = d.elementsByTagName("imq").item(0).toElement().text();
 	imIRC = d.elementsByTagName("imc").item(0).toElement().text();
@@ -151,7 +149,6 @@ void YABEntry::fillTQDomElement( TQDomElement &e ) const
 	e.setAttribute( "c3", additional3 );
 	e.setAttribute( "c4", additional4 );
 	e.setAttribute( "cm", TQString( notes ).replace( '\n', "
" ) );
-	e.setAttribute( "ima", imAIM );
 	e.setAttribute( "img", imGoogleTalk );
 	e.setAttribute( "imq", imICQ );
 	e.setAttribute( "imc", imIRC );
diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.h b/kopete/protocols/yahoo/libkyahoo/yabentry.h
index bcb2bce9..f11d446e 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabentry.h
+++ b/kopete/protocols/yahoo/libkyahoo/yabentry.h
@@ -44,7 +44,6 @@ struct YABEntry
 	TQString		additionalNumber;
 	TQString		altEmail1;
 	TQString		altEmail2;
-	TQString		imAIM;
 	TQString		imICQ;
 	TQString		imGoogleTalk;
 	TQString		imSkype;
diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
index 8164bae3..16b69b6d 100644
--- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
+++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
@@ -116,7 +116,6 @@ void YahooUserInfoDialog::slotSaveAndCloseClicked()
 	entry.additional3 = m_otherInfoWidget->note3Edit->text();
 	entry.additional4 = m_otherInfoWidget->note4Edit->text();
 	entry.notes = m_otherInfoWidget->commentsEdit->text();
-// 	entry.imAIM = m_genInfoWidget->firstNameEdit->text();
 // 	entry.imGoogleTalk = m_genInfoWidget->firstNameEdit->text();
 // 	entry.imICQ = m_genInfoWidget->firstNameEdit->text();
 // 	entry.imIRC = m_genInfoWidget->firstNameEdit->text();
@@ -186,7 +185,6 @@ void YahooUserInfoDialog::slotUser2()
 		entry.additional3 = m_otherInfoWidget->note3Edit->text().isEmpty() ? oldEntry->additional3 : m_otherInfoWidget->note3Edit->text();
 		entry.additional4 = m_otherInfoWidget->note4Edit->text().isEmpty() ? oldEntry->additional4 : m_otherInfoWidget->note4Edit->text();
 		entry.notes = m_otherInfoWidget->commentsEdit->text().isEmpty() ? oldEntry->notes : m_otherInfoWidget->commentsEdit->text();
-	// 	entry.imAIM = m_genInfoWidget->firstNameEdit->text().isEmpty() ? oldEntry->notes : m_otherInfoWidget->commentsEdit->text();
 	// 	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();
diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp
index 8d9c5b00..4db7ed59 100644
--- a/kopete/protocols/yahoo/yahoocontact.cpp
+++ b/kopete/protocols/yahoo/yahoocontact.cpp
@@ -735,7 +735,6 @@ void YahooContact::writeYABEntry()
 	setProperty( YahooProtocol::protocol()->propAdditionalNumber, m_YABEntry->additionalNumber );
 	setProperty( YahooProtocol::protocol()->propAltEmail1, m_YABEntry->altEmail1 );
 	setProperty( YahooProtocol::protocol()->propAltEmail2, m_YABEntry->altEmail2 );
-	setProperty( YahooProtocol::protocol()->propImAIM, m_YABEntry->imAIM );
 	setProperty( YahooProtocol::protocol()->propImICQ, m_YABEntry->imICQ );
 	setProperty( YahooProtocol::protocol()->propImGoogleTalk, m_YABEntry->imGoogleTalk );
 	setProperty( YahooProtocol::protocol()->propImSkype, m_YABEntry->imSkype );
@@ -797,7 +796,6 @@ void YahooContact::readYABEntry()
 	m_YABEntry->additionalNumber = property( YahooProtocol::protocol()->propAdditionalNumber ).value().toString();
 	m_YABEntry->altEmail1 = property( YahooProtocol::protocol()->propAltEmail1 ).value().toString();
 	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->imGoogleTalk = property( YahooProtocol::protocol()->propImGoogleTalk ).value().toString();
 	m_YABEntry->imSkype = property( YahooProtocol::protocol()->propImSkype ).value().toString();
diff --git a/kopete/protocols/yahoo/yahooprotocol.cpp b/kopete/protocols/yahoo/yahooprotocol.cpp
index 6b0328d6..371b264a 100644
--- a/kopete/protocols/yahoo/yahooprotocol.cpp
+++ b/kopete/protocols/yahoo/yahooprotocol.cpp
@@ -71,7 +71,6 @@ YahooProtocol::YahooProtocol( TQObject *parent, const char *name, const TQString
 	propAdditionalNumber("YABAdditionalNumber", i18n("Additional number"), TQString(), true, false),
 	propAltEmail1("YABAlternativeEmail1", i18n("Alternative email 1"), TQString(), true, false),
 	propAltEmail2("YABAlternativeEmail2", i18n("Alternative email 1"), TQString(), true, false),
-	propImAIM("YABIMAIM", i18n("AIM"), TQString(), true, false),
 	propImICQ("YABIMICQ", i18n("ICQ"), TQString(), true, false),
 	propImGoogleTalk("YABIMGoogleTalk", i18n("GoogleTalk"), TQString(), true, false),
 	propImSkype("YABIMSkype", i18n("Skype"), TQString(), true, false),
diff --git a/kopete/protocols/yahoo/yahooprotocol.h b/kopete/protocols/yahoo/yahooprotocol.h
index 4370e69f..cd42d61f 100644
--- a/kopete/protocols/yahoo/yahooprotocol.h
+++ b/kopete/protocols/yahoo/yahooprotocol.h
@@ -87,7 +87,6 @@ public:
 	const Kopete::ContactPropertyTmpl	propAdditionalNumber;
 	const Kopete::ContactPropertyTmpl	propAltEmail1;
 	const Kopete::ContactPropertyTmpl	propAltEmail2;
-	const Kopete::ContactPropertyTmpl	propImAIM;
 	const Kopete::ContactPropertyTmpl	propImICQ;
 	const Kopete::ContactPropertyTmpl	propImGoogleTalk;
 	const Kopete::ContactPropertyTmpl	propImSkype;