fix crash when pressing F2 on startup

enable undo

svn path=/trunk/KDE/kdebase/apps/; revision=737159

2 files changed, 11 insertions, 0 deletions

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 27000eae6..f278edddf 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -129,6 +129,7 @@ void DolphinPart::createActions()
 
     KAction* renameAction = new KAction(i18nc("@action:inmenu", "Rename..."), this);
     connect(renameAction, SIGNAL(triggered()), m_view, SLOT(renameSelectedItems()));
+    renameAction->setEnabled(false);
     renameAction->setShortcut(Qt::Key_F2);
     actionCollection()->addAction("rename", renameAction);
 }
diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index eb1e009ec..bf81b55f4 100644
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -34,6 +34,10 @@ class KAboutData;
 class DolphinPart : public KParts::ReadOnlyPart
 {
     Q_OBJECT
+    // Used by konqueror. Technically it means "we want undo enabled if
+    // there are things in the undo history and the current part is a dolphin part".
+    // Even though it's konqueror doing the undo...
+    Q_PROPERTY( bool supportsUndo READ supportsUndo )
 
 public:
     explicit DolphinPart(QWidget* parentWidget, QObject* parent, const QStringList& args);
@@ -43,7 +47,13 @@ public:
 
     virtual bool openUrl(const KUrl& url);
 
+    /// see the supportsUndo property
+    bool supportsUndo() const { return true; }
+
 protected:
+    /**
+     * We reimplement openUrl so no need to implement openFile.
+     */
     virtual bool openFile() { return true; }
 
 private Q_SLOTS: