diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2017-12-30 15:57:14 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-12-30 15:57:14 +0100 |
| commit | dc34f9c39105b0fe20ba45c064a08406084acbe2 (patch) | |
| tree | 8c9aa539bbf33b8f6529a9adbc3445da88ba277e /kopete/libkopete | |
| parent | f6fd4ab6c01a9deb7a1eabb7f8aa908676831eba (diff) | |
| download | tdenetwork-dc34f9c39105b0fe20ba45c064a08406084acbe2.tar.gz tdenetwork-dc34f9c39105b0fe20ba45c064a08406084acbe2.zip | |
kopete: Remove AIM protocol
AIM network has been shutdown in 2017-12-15
This resolves Bug 2846
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kopete/libkopete')
| -rw-r--r-- | kopete/libkopete/kopetecontactlist.cpp | 23 | ||||
| -rw-r--r-- | kopete/libkopete/kopetecontactlistelement.cpp | 4 |
2 files changed, 5 insertions, 22 deletions
diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp index dc8cdeb1..f4702885 100644 --- a/kopete/libkopete/kopetecontactlist.cpp +++ b/kopete/libkopete/kopetecontactlist.cpp @@ -516,8 +516,8 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers if( !oldContactElement.isNull() && oldContactElement.tagName() == TQString::fromLatin1("address-book-field") ) { // Convert address book fields. - // Jabber will be called "xmpp", Aim/Toc and Aim/Oscar both will - // be called "aim". AIM, IRC, Oscar and SMS don't use address + // Jabber will be called "xmpp". + // IRC, Oscar and SMS don't use address // book fields yet; Gadu and ICQ can be converted as-is. // As Yahoo is unfinished we won't try to convert at all. TQString id = oldContactElement.attribute( TQString::fromLatin1( "id" ), TQString() ); @@ -604,7 +604,6 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers TQString id = oldContactElement.attribute( TQString::fromLatin1( "plugin-id" ), TQString() ); TQString data = oldContactElement.text(); - bool convertOldAim = false; uint fieldCount = 1; TQString addressBookLabel; if( id == TQString::fromLatin1("IRCProtocol") ) @@ -612,17 +611,6 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers fieldCount = 3; addressBookLabel = TQString::fromLatin1("irc"); } - else if( id == TQString::fromLatin1("OscarProtocol") ) - { - fieldCount = 2; - addressBookLabel = TQString::fromLatin1("aim"); - } - else if( id == TQString::fromLatin1("AIMProtocol") ) - { - id = TQString::fromLatin1("OscarProtocol"); - convertOldAim = true; - addressBookLabel = TQString::fromLatin1("aim"); - } else if( id == TQString::fromLatin1("ICQProtocol") || id == TQString::fromLatin1("WPProtocol") || id == TQString::fromLatin1("GaduProtocol") ) { fieldCount = 1; @@ -647,8 +635,7 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers } // Do the actual conversion - if ( id == TQString::fromLatin1( "OscarProtocol" ) || - id == TQString::fromLatin1( "AIMProtocol" ) || id == TQString::fromLatin1( "IRCProtocol" ) || + if ( id == TQString::fromLatin1( "IRCProtocol" ) || id == TQString::fromLatin1( "ICQProtocol" ) || id == TQString::fromLatin1( "JabberProtocol" ) || id == TQString::fromLatin1( "SMSProtocol" ) || id == TQString::fromLatin1( "WPProtocol" ) || id == TQString::fromLatin1( "GaduProtocol" ) ) @@ -682,7 +669,7 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "displayName" ) ); - if( convertOldAim || id == TQString::fromLatin1("ICQProtocol") || id == TQString::fromLatin1("WPProtocol") || id == TQString::fromLatin1("GaduProtocol") ) + if( id == TQString::fromLatin1("ICQProtocol") || id == TQString::fromLatin1("WPProtocol") || id == TQString::fromLatin1("GaduProtocol") ) dataField.appendChild( newList.createTextNode( strList[ idx ] ) ); else if( id == TQString::fromLatin1("JabberProtocol") ) dataField.appendChild( newList.createTextNode( strList[ idx + 2 ] ) ); @@ -725,7 +712,7 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers idx += 2; } - // AIM, IRC, Oscar and SMS didn't store address book fields up + // IRC, Oscar and SMS didn't store address book fields up // to now, so create one if( id != TQString::fromLatin1("ICQProtocol") && id != TQString::fromLatin1("JabberProtocol") && id != TQString::fromLatin1("WPProtocol") && id != TQString::fromLatin1("GaduProtocol") ) { diff --git a/kopete/libkopete/kopetecontactlistelement.cpp b/kopete/libkopete/kopetecontactlistelement.cpp index cfce58b6..842228f6 100644 --- a/kopete/libkopete/kopetecontactlistelement.cpp +++ b/kopete/libkopete/kopetecontactlistelement.cpp @@ -164,10 +164,6 @@ bool ContactListElement::fromXML( const TQDomElement& element ) TQMap<TQString, TQString> pluginData; TQString pluginId = element.attribute( TQString::fromLatin1( "plugin-id" ), TQString() ); - //in kopete 0.6 the AIM protocol was called OSCAR - if ( pluginId == TQString::fromLatin1( "OscarProtocol" ) ) - pluginId = TQString::fromLatin1( "AIMProtocol" ); - TQDomNode field = element.firstChild(); while( !field.isNull() ) { |