From 0486034738b850c210b1389a8c3ae51a6b9fad23 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 29 Mar 2014 00:54:51 +0900 Subject: Removed MSN support across Kopete by removing the MSN protocol and the netmeeting plugin. This resolves bug 1547. --- kopete/libkopete/kopetecontactlist.cpp | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) (limited to 'kopete/libkopete/kopetecontactlist.cpp') diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp index 2a8d69c6..889bc6e2 100644 --- a/kopete/libkopete/kopetecontactlist.cpp +++ b/kopete/libkopete/kopetecontactlist.cpp @@ -358,11 +358,6 @@ void ContactList::slotPhotoChanged() emit globalIdentityChanged(Kopete::Global::Properties::self()->photo().key(), myself()->picture().path()); mutex=false; - /* The mutex is usefull to don't have such as stack overflow - Kopete::ContactList::slotPhotoChanged -> Kopete::ContactList::globalIdentityChanged - MSNAccount::slotGlobalIdentityChanged -> Kopete::Contact::propertyChanged - Kopete::MetaContact::slotPropertyChanged -> Kopete::MetaContact::photoChanged -> Kopete::ContactList::slotPhotoChanged - */ } /////////////////////////////////////////////////////////////////////////////////////////////// @@ -522,7 +517,7 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers { // Convert address book fields. // Jabber will be called "xmpp", Aim/Toc and Aim/Oscar both will - // be called "aim". MSN, AIM, IRC, Oscar and SMS don't use address + // be called "aim". AIM, 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() ); @@ -612,12 +607,7 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers bool convertOldAim = false; uint fieldCount = 1; TQString addressBookLabel; - if( id == TQString::fromLatin1("MSNProtocol") ) - { - fieldCount = 3; - addressBookLabel = TQString::fromLatin1("msn"); - } - else if( id == TQString::fromLatin1("IRCProtocol") ) + if( id == TQString::fromLatin1("IRCProtocol") ) { fieldCount = 3; addressBookLabel = TQString::fromLatin1("irc"); @@ -657,7 +647,7 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers } // Do the actual conversion - if( id == TQString::fromLatin1( "MSNProtocol" ) || id == TQString::fromLatin1( "OscarProtocol" ) || + if ( id == TQString::fromLatin1( "OscarProtocol" ) || id == TQString::fromLatin1( "AIMProtocol" ) || id == TQString::fromLatin1( "IRCProtocol" ) || id == TQString::fromLatin1( "ICTQProtocol" ) || id == TQString::fromLatin1( "JabberProtocol" ) || id == TQString::fromLatin1( "SMSProtocol" ) || id == TQString::fromLatin1( "WPProtocol" ) || @@ -699,14 +689,7 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers else dataField.appendChild( newList.createTextNode( strList[ idx + 1 ] ) ); - if( id == TQString::fromLatin1("MSNProtocol") ) - { - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); - pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "groups" ) ); - dataField.appendChild( newList.createTextNode( strList[ idx + 2 ] ) ); - } - else if( id == TQString::fromLatin1("IRCProtocol") ) + if( id == TQString::fromLatin1("IRCProtocol") ) { dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); @@ -742,7 +725,7 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers idx += 2; } - // MSN, AIM, IRC, Oscar and SMS didn't store address book fields up + // AIM, IRC, Oscar and SMS didn't store address book fields up // to now, so create one if( id != TQString::fromLatin1("ICTQProtocol") && id != TQString::fromLatin1("JabberProtocol") && id != TQString::fromLatin1("WPProtocol") && id != TQString::fromLatin1("GaduProtocol") ) { -- cgit v1.2.1