[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdenetwork/kopete/protocols/oscar
From:       Richard Smith <kde () metafoo ! co ! uk>
Date:       2004-02-23 12:21:57
Message-ID: 20040223122157.F0F3F9953 () office ! kde ! org
[Download RAW message or body]

CVS commit by lilachaze: 

Don't try to reconnect until current connection has finished failing. Also,
don't pop up a 'password was wrong' dialog box at the same time as a
'password was wrong, enter password' dialog. [BACKPORT]
CCMAIL: 75471-done@bugs.kde.org


  M +9 -5      oscaraccount.cpp   1.103.2.3


--- kdenetwork/kopete/protocols/oscar/oscaraccount.cpp  #1.103.2.2:1.103.2.3
@@ -224,11 +224,15 @@ void OscarAccount::slotError(QString err
                 OscarAccount::disconnect();
 
+        // suppress error dialog for password-was-wrong error, since we're about
+        // to pop up a password dialog saying the same thing when we try to reconenct
+        if (errorCode != 5)
+        {
         KMessageBox::queuedMessageBox(0, KMessageBox::Error, errmsg,
                 i18n("Connection Lost - ICQ Plugin"), KMessageBox::Notify);
-
-        if (errorCode == 5)
+        }
+        else
         {
                 d->passwordWrong = true;
-                connect();
+                QTimer::singleShot( 0, this, SLOT( connect() ) );
         }
 }


[prev in list] [next in list] [prev in thread] [next in thread]