From 70e337eaa8e523d74e3b3757ac6972a72b8e44cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 30 Dec 2017 16:04:07 +0100 Subject: kopete: Remove the AIM specific code from liboscar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 036b0229dba794cf6267b522ac1f6449b6708d51) --- kopete/protocols/oscar/oscarversionupdater.cpp | 40 -------------------------- 1 file changed, 40 deletions(-) (limited to 'kopete/protocols/oscar/oscarversionupdater.cpp') diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp index ab899883..7d5806e3 100644 --- a/kopete/protocols/oscar/oscarversionupdater.cpp +++ b/kopete/protocols/oscar/oscarversionupdater.cpp @@ -32,7 +32,6 @@ OscarVersionUpdater::OscarVersionUpdater() : mStamp( 1 ), mUpdating( false ) { initICQVersionInfo(); - initAIMVersionInfo(); } OscarVersionUpdater::~OscarVersionUpdater() @@ -100,37 +99,8 @@ void OscarVersionUpdater::initICQVersionInfo() mICQVersion.lang = config.readEntry( "Lang", "en" ); } -void OscarVersionUpdater::initAIMVersionInfo() -{ - kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; - - TDEConfigGroup config( TDEGlobal::config(), "AIMVersion" ); - - mAIMVersion.clientString = config.readEntry( "ClientString", "AOL Instant Messenger (SM), version 5.1.3036/WIN32" ); - mAIMVersion.clientId = config.readEntry( "ClientId", "0x0109" ).toUShort( 0, 0 ); - mAIMVersion.major = config.readEntry( "Major", "0x0005" ).toUShort( 0, 0 ); - mAIMVersion.minor = config.readEntry( "Minor", "0x0001" ).toUShort( 0, 0 ); - mAIMVersion.point = config.readEntry( "Point", "0x0000" ).toUShort( 0, 0 ); - mAIMVersion.build = config.readEntry( "Build", "0x0bdc" ).toUShort( 0, 0 ); - mAIMVersion.other = config.readEntry( "Other", "0x000000d2" ).toUInt( 0, 0 ); - mAIMVersion.country = config.readEntry( "Country", "us" ); - mAIMVersion.lang = config.readEntry( "Lang", "en" ); -} - void OscarVersionUpdater::printDebug() { - kdDebug(OSCAR_RAW_DEBUG) << "*************** AIM VERSION INFO ***************" << endl; - kdDebug(OSCAR_RAW_DEBUG) << "client string: " << mAIMVersion.clientString << endl; - kdDebug(OSCAR_RAW_DEBUG) << "client id: " << TQString::number( mAIMVersion.clientId, 16 ) << endl; - kdDebug(OSCAR_RAW_DEBUG) << "major: " << TQString::number( mAIMVersion.major, 16 ) << endl; - kdDebug(OSCAR_RAW_DEBUG) << "minor: " << TQString::number( mAIMVersion.minor, 16 ) << endl; - kdDebug(OSCAR_RAW_DEBUG) << "point: " << TQString::number( mAIMVersion.point, 16 ) << endl; - kdDebug(OSCAR_RAW_DEBUG) << "build: " << TQString::number( mAIMVersion.build, 16 ) << endl; - kdDebug(OSCAR_RAW_DEBUG) << "other: " << TQString::number( mAIMVersion.other, 16 ) << endl; - kdDebug(OSCAR_RAW_DEBUG) << "country: " << mAIMVersion.country << endl; - kdDebug(OSCAR_RAW_DEBUG) << "lang: " << mAIMVersion.lang << endl; - kdDebug(OSCAR_RAW_DEBUG) << "************************************************" << endl; - kdDebug(OSCAR_RAW_DEBUG) << "*************** ICQ VERSION INFO ***************" << endl; kdDebug(OSCAR_RAW_DEBUG) << "client string: " << mICQVersion.clientString << endl; kdDebug(OSCAR_RAW_DEBUG) << "client id: " << TQString::number( mICQVersion.clientId, 16 ) << endl; @@ -169,7 +139,6 @@ void OscarVersionUpdater::slotTransferResult ( TDEIO::Job *job ) if ( doc.setContent ( mVersionData ) ) { Oscar::ClientVersion tmpICQ = mICQVersion; - Oscar::ClientVersion tmpAIM = mAIMVersion; parseDocument( doc ); @@ -178,12 +147,6 @@ void OscarVersionUpdater::slotTransferResult ( TDEIO::Job *job ) storeVersionInfo( "ICQVersion", mICQVersion ); bUpdate = true; } - - if ( !equal( tmpAIM, mAIMVersion ) ) - { - storeVersionInfo( "AIMVersion", mAIMVersion ); - bUpdate = true; - } } } @@ -211,9 +174,6 @@ void OscarVersionUpdater::parseDocument( TQDomDocument& doc ) { if ( versionElement.tagName() == "icq" ) parseVersion( mICQVersion, versionElement ); - else if ( versionElement.tagName() == "aim" ) - parseVersion( mAIMVersion, versionElement ); - versionElement = versionElement.nextSibling().toElement(); } } -- cgit v1.2.1