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

List:       kde-commits
Subject:    kdenetwork/kopete/protocols/oscar
From:       Matt Rogers <mattr () kde ! org>
Date:       2005-03-31 14:46:27
Message-ID: 20050331144627.88D184A6 () office ! kde ! org
[Download RAW message or body]

CVS commit by mattr: 

Add an error message for the service not available errors. Fixes bug 102913.
There might be a backport if kde-i18n-doc doesn't mind the new string.

BUG: 102913


  M +9 -1      oscaraccount.cpp   1.172


--- kdenetwork/kopete/protocols/oscar/oscaraccount.cpp  #1.171:1.172
@@ -217,4 +217,5 @@ void OscarAccount::slotGoOnline()
 void OscarAccount:: protocolError( int error, int psError, const QString& message )
 {
+        QString realMessage = message;
         if ( error == Client::NoError )
                 return;
@@ -237,4 +238,11 @@ void OscarAccount:: protocolError( int e
                         return;
                 }
+                
+                if ( psError == 16 || psError == 2 )
+                {
+                        disconnected( Kopete::Account::Manual );
+                        realMessage = i18n("The %1 service is temporarily \
unavailable. Please try again later.") +                                      .arg( \
d->engine->isIcq() ? i18n( "ICQ" ) : i18n( "AIM" ) ); +                
                 if ( psError == 0 ) //zero is a generic error when i don't know \
what's wrong. :/  {
@@ -243,5 +251,5 @@ void OscarAccount:: protocolError( int e
                 
                 KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), \
                KMessageBox::Error,
-                                               message, i18n( "%1 Disconnected" \
).arg( d->engine->userId() ) ); +                                               \
realMessage, i18n( "%1 Disconnected" ).arg( d->engine->userId() ) );  return;
         }


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