Merged very early alpha-version of Dolphin 2.0

[dolphin.git] / src / views / renamedialog.cpp

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 810562a51a37b17e1c4bfbe0e0ece31283cd4cdf..c0c6ad58c1153daed7c15b3f7be661fb39bffb4d 100644 (file)
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -136,7 +136,7 @@ void RenameDialog::slotButtonClicked(int button)
             Q_ASSERT(m_items.count() == 1);
             const KUrl oldUrl = m_items.first().url();
             KUrl newUrl = oldUrl;
-            newUrl.setFileName(m_newName);
+            newUrl.setFileName(KIO::encodeFileName(m_newName));
             KonqOperations::rename(this, oldUrl, newUrl);
         } else {
             renameItems();
@@ -148,7 +148,7 @@ void RenameDialog::slotButtonClicked(int button)
 
 void RenameDialog::slotTextChanged(const QString& newName)
 {
-    bool enable = !newName.isEmpty();
+    bool enable = !newName.isEmpty() && (newName != QLatin1String("..")) && (newName != QLatin1String("."));
     if (enable) {
         if (m_renameOneItem) {
             enable = enable && (newName != m_newName);
@@ -185,7 +185,7 @@ void RenameDialog::renameItems()
         const KUrl oldUrl = item.url();
         if (oldUrl.fileName() != newName) {
             KUrl newUrl = oldUrl;
-            newUrl.setFileName(newName);
+            newUrl.setFileName(KIO::encodeFileName(newName));
             KonqOperations::rename(this, oldUrl, newUrl);
         }
     }