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

List:       kde-commits
Subject:    [kdepim-runtime/KDE/4.14] resources/dav/common: Don't fail if the deleted item has vanished
From:       Grégory_Oestreicher <greg () kamago ! net>
Date:       2014-08-30 10:20:19
Message-ID: E1XNflb-0000IS-2T () scm ! kde ! org
[Download RAW message or body]

Git commit 4f943037db1c3a5fa8ebdaecfec4440d7849d003 by Grégory Oestreicher.
Committed on 29/08/2014 at 20:52.
Pushed by goestreicher into branch 'KDE/4.14'.

Don't fail if the deleted item has vanished

M  +10   -8    resources/dav/common/davitemdeletejob.cpp

http://commits.kde.org/kdepim-runtime/4f943037db1c3a5fa8ebdaecfec4440d7849d003

diff --git a/resources/dav/common/davitemdeletejob.cpp \
b/resources/dav/common/davitemdeletejob.cpp index 91f6768..a367b04 100644
--- a/resources/dav/common/davitemdeletejob.cpp
+++ b/resources/dav/common/davitemdeletejob.cpp
@@ -48,15 +48,17 @@ void DavItemDeleteJob::davJobFinished( KJob *job )
                               0 :
                               deleteJob->queryMetaData( \
QLatin1String("responsecode") ).toInt();  
-    QString err;
-    if ( deleteJob->error() != KIO::ERR_SLAVE_DEFINED )
-      err = KIO::buildErrorString( deleteJob->error(), deleteJob->errorText() );
-    else
-      err = deleteJob->errorText();
+    if ( responseCode != 404 && responseCode != 410 ) {
+      QString err;
+      if ( deleteJob->error() != KIO::ERR_SLAVE_DEFINED )
+        err = KIO::buildErrorString( deleteJob->error(), deleteJob->errorText() );
+      else
+        err = deleteJob->errorText();
 
-    setError( UserDefinedError + responseCode );
-    setErrorText( i18n( "There was a problem with the request. The item has not been \
                deleted from the server.\n"
-                        "%1 (%2).", err, responseCode ) );
+      setError( UserDefinedError + responseCode );
+      setErrorText( i18n( "There was a problem with the request. The item has not \
been deleted from the server.\n" +                          "%1 (%2).", err, \
responseCode ) ); +    }
   }
 
   emitResult();


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