summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/oscar/oscaraccount.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/oscar/oscaraccount.cpp')
-rw-r--r--kopete/protocols/oscar/oscaraccount.cpp24
1 files changed, 6 insertions, 18 deletions
diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp
index af2b8ba5..63402b34 100644
--- a/kopete/protocols/oscar/oscaraccount.cpp
+++ b/kopete/protocols/oscar/oscaraccount.cpp
@@ -95,21 +95,17 @@ public:
};
OscarAccount::OscarAccount(Kopete::Protocol *parent, const TQString &accountID, const char *name, bool isICQ)
-: Kopete::PasswordedAccount( parent, accountID, isICQ ? 8 : 16, name )
+: Kopete::PasswordedAccount( parent, accountID, 8, name )
{
kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << " accountID='" << accountID <<
"', isICQ=" << isICQ << endl;
d = new OscarAccountPrivate( *this );
d->engine = new Client( this );
- d->engine->setIsIcq( isICQ );
-
+
d->versionAlreadyUpdated = false;
d->versionUpdaterStamp = OscarVersionUpdater::self()->stamp();
- if ( isICQ )
- d->engine->setVersion( OscarVersionUpdater::self()->getICQVersion() );
- else
- d->engine->setVersion( OscarVersionUpdater::self()->getAIMVersion() );
+ d->engine->setVersion( OscarVersionUpdater::self()->getICQVersion() );
d->engine->setCodecProvider( d );
d->olnscDialog = 0L;
@@ -182,13 +178,6 @@ void OscarAccount::loginActions()
kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "processing SSI list" << endl;
processSSIList();
- //start a chat nav connection
- if ( !engine()->isIcq() )
- {
- kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "sending request for chat nav service" << endl;
- d->engine->requestServerRedirect( 0x000D );
- }
-
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "sending request for icon service" << endl;
d->engine->requestServerRedirect( 0x0010 );
@@ -473,7 +462,7 @@ void OscarAccount::setBuddyIcon( KURL url )
if ( image.isNull() )
return;
- const TQSize size = ( d->engine->isIcq() ) ? TQSize( 52, 64 ) : TQSize( 48, 48 );
+ const TQSize size = TQSize( 52, 64 );
image = image.smoothScale( size, TQ_ScaleMax );
if( image.width() > size.width())
@@ -805,9 +794,8 @@ void OscarAccount::slotSendBuddyIcon()
TQString OscarAccount::getFLAPErrorMessage( int code )
{
- bool isICQ = d->engine->isIcq();
- TQString acctType = isICQ ? i18n("ICQ") : i18n("AIM");
- TQString acctDescription = isICQ ? i18n("ICQ user id", "UIN") : i18n("AIM user id", "screen name");
+ TQString acctType = i18n("ICQ");
+ TQString acctDescription = i18n("ICQ user id", "UIN");
TQString reason;
//FLAP errors are always fatal
//negative codes are things added by liboscar developers