Fix regression introduced in 4.5 and allow to add the menu actions "Show Information...

[dolphin.git] / src / panels / panel.cpp

diff --git a/src/panels/panel.cpp b/src/panels/panel.cpp
index e8f5c82771a7a6ae4b82aaf9e641010d6fb50d21..6d11422d8a6cbea1a1dc45cd29f46abc2408d0ed 100644 (file)
--- a/src/panels/panel.cpp
+++ b/src/panels/panel.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff@gmail.com>       *
- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2006-2010 by Peter Penz <peter.penz@gmx.at>             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -19,8 +19,6 @@
  ***************************************************************************/
 
 #include "panel.h"
-#include <QtGui/QWidget>
-#include <kfileitem.h>
 #include <kurl.h>
 
 Panel::Panel(QWidget* parent) :
@@ -33,14 +31,23 @@ Panel::~Panel()
 {
 }
 
-const KUrl& Panel::url() const
+KUrl Panel::url() const
 {
     return m_url;
 }
 
 void Panel::setUrl(const KUrl& url)
 {
+    if (url.equals(m_url, KUrl::CompareWithoutTrailingSlash)) {
+        return;
+    }
+
+    const KUrl oldUrl = m_url;
     m_url = url;
+    const bool accepted = urlChanged();
+    if (!accepted) {
+        m_url = oldUrl;
+    }
 }
 
 #include "panel.moc"