Internal cleanup for panels: Let the panel-implementations decide whether they accept an URL or not.

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

1 files changed, 11 insertions, 2 deletions

diff --git a/src/panels/panel.cpp b/src/panels/panel.cpp
index 9e7ff4ff3..6d11422d8 100644
--- a/src/panels/panel.cpp
+++ b/src/panels/panel.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2006 by Cvetoslav Ludmiloff <[email protected]>       *
- *   Copyright (C) 2006 by Peter Penz <[email protected]>                  *
+ *   Copyright (C) 2006-2010 by Peter Penz <[email protected]>             *
  *                                                                         *
  *   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  *
@@ -31,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"