From ca6522861c321eb3a7ec4ce67c1f2fc59db5fcea Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Fri, 5 Oct 2007 09:14:03 +0000
Subject: [PATCH] Merged KIO::JobFlags branch

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=721447
---
 src/SessionController.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SessionController.cpp b/src/SessionController.cpp
index 56ef67fec..fb30e0a12 100644
--- a/src/SessionController.cpp
+++ b/src/SessionController.cpp
@@ -1020,11 +1020,11 @@ void SaveHistoryTask::execute()
 
         KIO::TransferJob* job = KIO::put( url, 
                                           -1,   // no special permissions
-                                          true, // overwrite existing files
-                                          false,// do not resume an existing transfer
-                                          !url.isLocalFile() // show progress information only for remote
-                                                             // URLs
-                                                             //
+                                          // overwrite existing files
+                                          // do not resume an existing transfer
+                                          // show progress information only for remote
+                                          // URLs
+                                          KIO::Overwrite | (url.isLocalFile() ? KIO::HideProgressInfo : KIO::DefaultFlags)
                                                              // a better solution would be to show progress
                                                              // information after a certain period of time
                                                              // instead, since the overall speed of transfer