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

List:       kde-commits
Subject:    KDE/kdelibs/kio/kio
From:       Kévin Ottens <ervin () ipsquad ! net>
Date:       2005-07-15 10:08:02
Message-ID: 1121422082.398140.29583.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 434761 by ervin:

Oops, I slightly modified (is/set)Interactive() semantic.

Going back to something saner and strengthen (is/set)Interactive() semantic.
If isInteractive() is false, you must not get any message box.




 M  +1 -1      forwardingslavebase.cpp  
 M  +2 -2      job.cpp  


--- trunk/KDE/kdelibs/kio/kio/forwardingslavebase.cpp #434760:434761
@@ -344,7 +344,7 @@
 {
     // We will forward the warning message, no need to let the job
     // display it itself
-    job->setAutoWarningHandlingEnabled(false);
+    job->setInteractive(false);
 
     connect( job, SIGNAL( result(KIO::Job *) ),
              this, SLOT( slotResult(KIO::Job *) ) );
--- trunk/KDE/kdelibs/kio/kio/job.cpp #434760:434761
@@ -217,7 +217,7 @@
   // If we are displaying a progress dialog, remove it first.
   if ( m_progressId ) // Did we get an ID from the observer ?
     Observer::self()->jobFinished( m_progressId );
-  if ( m_error && d->m_autoErrorHandling )
+  if ( m_error && d->m_interactive && d->m_autoErrorHandling )
     showErrorDialog( d->m_errorParentWidget );
   emit result(this);
   delete this;
@@ -578,7 +578,7 @@
 
 void SimpleJob::slotWarning( const QString & errorText )
 {
-    if (isAutoWarningHandlingEnabled())
+    if (isInteractive() && isAutoWarningHandlingEnabled())
     {
         static uint msgBoxDisplayed = 0;
         if ( msgBoxDisplayed == 0 ) // don't bomb the user with message boxes, only one at a time
[prev in list] [next in list] [prev in thread] [next in thread]