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

List:       kde-commits
Subject:    KDE/kdepim
From:       Laurent Montel <montel () kde ! org>
Date:       2006-07-17 12:38:45
Message-ID: 1153139925.853658.21454.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 563376 by mlaurent:

Deprecated--


 M  +3 -1      kmail/folderdiaacltab.cpp  
 M  +3 -2      kmail/kmcomposewin.cpp  
 M  +5 -1      kmail/kmfoldercachedimap.cpp  
 M  +3 -1      kmail/popaccount.cpp  
 M  +3 -1      kmail/sievejob.cpp  
 M  +5 -2      korganizer/koeditorattachments.cpp  


--- trunk/KDE/kdepim/kmail/folderdiaacltab.cpp #563375:563376
@@ -42,6 +42,7 @@
 
 #include <addressesdialog.h>
 #include <kabc/addresseelist.h>
+#include <kio/jobuidelegate.h>
 #ifdef KDEPIM_NEW_DISTRLISTS
 #include <libkdepim/distributionlist.h> // libkdepim
 #else
@@ -769,7 +770,8 @@
   mImapAccount->removeJob( it );
 
   if ( job->error() ) {
-    static_cast<KIO::Job*>(job)->showErrorDialog( this );
+	static_cast<KIO::Job*>(job)->ui()->setWindow( this );
+	static_cast<KIO::Job*>(job)->ui()->showErrorMessage();
     if ( mAccepting ) {
       emit cancelAccept();
       mAccepting = false; // don't emit readyForAccept anymore
--- trunk/KDE/kdepim/kmail/kmcomposewin.cpp #563375:563376
@@ -52,7 +52,7 @@
 #include "objecttreeparser.h"
 
 #include "kmfoldermaildir.h"
-
+#include <kio/jobuidelegate.h>
 #include <libkpimidentities/identitymanager.h>
 #include <libkpimidentities/identitycombo.h>
 #include <libkpimidentities/identity.h>
@@ -2516,7 +2516,8 @@
   if (job->error())
   {
     mMapAtmLoadData.erase(it);
-    static_cast<KIO::Job*>(job)->showErrorDialog();
+	static_cast<KIO::Job*>(job)->ui()->setWindow( 0);
+	static_cast<KIO::Job*>(job)->ui()->showErrorMessage();
     return;
   }
   if ((*it).insert)
--- trunk/KDE/kdepim/kmail/kmfoldercachedimap.cpp #563375:563376
@@ -34,6 +34,7 @@
 #endif
 
 #include <errno.h>
+#include <kio/jobuidelegate.h>
 
 #include "kmfoldercachedimap.h"
 #include "undostack.h"
@@ -2000,9 +2001,12 @@
   if ( (*it).parent != folder() ) return; // Shouldn't happen
 
   if ( job->error() )
+  {		  
     // Display error but don't abort the sync just for this
     // PENDING(dfaure) reconsider using handleJobError now that it offers continue/cancel
-    static_cast<KIO::Job*>(job)->showErrorDialog();
+	static_cast<KIO::Job*>(job)->ui()->setWindow( 0 );
+	static_cast<KIO::Job*>(job)->ui()->showErrorMessage();
+  }	
   else
     kmkernel->iCalIface().addFolderChange( folder(), KMailICalIfaceImpl::ACL );
 
--- trunk/KDE/kdepim/kmail/popaccount.cpp #563375:563376
@@ -44,6 +44,7 @@
 #include <kio/scheduler.h>
 #include <kio/passdlg.h>
 #include <kconfig.h>
+#include <kio/jobuidelegate.h>
 using KIO::MetaData;
 
 static const unsigned short int pop3DefaultPort = 110;
@@ -976,7 +977,8 @@
       }
       // force the dialog to be shown next time the account is checked
       if (!mStorePasswd) mPasswd = "";
-      job->showErrorDialog();
+	  job->ui()->setWindow( 0 );
+	  job->ui()->showErrorMessage();
     }
     slotCancel();
   }
--- trunk/KDE/kdepim/kmail/sievejob.cpp #563375:563376
@@ -19,6 +19,7 @@
 #include "sievejob.h"
 
 #include <kio/job.h>
+#include <kio/jobuidelegate.h>
 using KIO::Job;
 // <kio/global.h>
 using KIO::UDSEntryList;
@@ -183,7 +184,8 @@
 
     // check for errors:
     if ( job->error() ) {
-      static_cast<KIO::Job*>(job)->showErrorDialog( 0 );
+      static_cast<KIO::Job*>(job)->ui()->setWindow( 0 );
+      static_cast<KIO::Job*>(job)->ui()->showErrorMessage();
 
       emit result( this, false, mScript, mUrl.fileName() == mActiveScriptName );
 
--- trunk/KDE/kdepim/korganizer/koeditorattachments.cpp #563375:563376
@@ -33,7 +33,7 @@
 
 #include <kio/job.h>
 #include <kio/jobclasses.h>
-
+#include <kio/jobuidelegate.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
@@ -548,7 +548,10 @@
 void KOEditorAttachments::copyComplete( KJob *job )
 {
   if ( job->error() )
-    static_cast<KIO::Job*>(job)->showErrorDialog( this );
+  {
+    static_cast<KIO::Job*>(job)->ui()->setWindow( this );
+	static_cast<KIO::Job*>(job)->ui()->showErrorMessage();
+  }
   else {
     addAttachment( static_cast<KIO::CopyJob *>( job )->destURL().url(),
                    QString(),
[prev in list] [next in list] [prev in thread] [next in thread]