From cb1f42a1eb3584742fa33e28759ed8fbab199c5b Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Mon, 30 Apr 2012 18:26:21 +0200
Subject: Places Panel: Minor fixes/improvements

- Determine group of a new entry dependent from the protocol
- Allow panels to forward error-messages to the view-container
  (also applied to Folders Panel)
---
 src/panels/places/placesitemeditdialog.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/panels/places/placesitemeditdialog.cpp')

diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp
index 0fdd03060..f8b985f6f 100644
--- a/src/panels/places/placesitemeditdialog.cpp
+++ b/src/panels/places/placesitemeditdialog.cpp
@@ -25,6 +25,7 @@
 
 #include <KAboutData>
 #include <KComponentData>
+#include <KDebug>
 #include <KFile>
 #include <KIconButton>
 #include <KLineEdit>
@@ -69,7 +70,12 @@ void PlacesItemEditDialog::setText(const QString& text)
 
 QString PlacesItemEditDialog::text() const
 {
-    return m_textEdit->text().isEmpty() ? m_urlEdit->url().fileName() : m_textEdit->text();
+    QString text = m_textEdit->text();
+    if (text.isEmpty()) {
+        const KUrl url = m_urlEdit->url();
+        text = url.fileName().isEmpty() ? url.prettyUrl() : url.fileName();
+    }
+    return text;
 }
 
 void PlacesItemEditDialog::setUrl(const KUrl& url)
-- 
cgit v1.3.1