Backport for #156375: don't add a place having an empty name

svn path=/branches/KDE/4.0/kdebase/apps/; revision=766407

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index d7953df4fd4c13e8b08aa64ef29297d3ccbf489c..601e5f141bbe8fc3ed47d828100c93a050712305 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -198,7 +198,7 @@ void DolphinContextMenu::openItemContextMenu()
     if ((addToPlacesAction != 0) && (activatedAction == addToPlacesAction)) {
         const KUrl selectedUrl(m_fileInfo.url());
         if (selectedUrl.isValid()) {
     if ((addToPlacesAction != 0) && (activatedAction == addToPlacesAction)) {
         const KUrl selectedUrl(m_fileInfo.url());
         if (selectedUrl.isValid()) {

-            DolphinSettings::instance().placesModel()->addPlace(selectedUrl.fileName(),
+            DolphinSettings::instance().placesModel()->addPlace(placesName(selectedUrl),

                                                                 selectedUrl);
         }
     } else if (openWithActions.contains(activatedAction)) {
                                                                 selectedUrl);
         }
     } else if (openWithActions.contains(activatedAction)) {


@@ -266,7 +266,7 @@ void DolphinContextMenu::openViewportContextMenu()
     } else if (action == addToPlacesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {
     } else if (action == addToPlacesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {

-            DolphinSettings::instance().placesModel()->addPlace(url.fileName(), url);
+            DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);

         }
     }
 
         }
     }
 


@@ -406,4 +406,13 @@ void DolphinContextMenu::addShowMenubarAction(KMenu* menu)
     }
 }
 
     }
 }
 

+QString DolphinContextMenu::placesName(const KUrl& url) const
+{
+    QString name = url.fileName();
+    if (name.isEmpty()) {
+        name = url.host();
+    }
+    return name;
+}
+

 #include "dolphincontextmenu.moc"
 #include "dolphincontextmenu.moc"

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index c9099925231ed90437e8ad40caf1f4b597c687e4..a7cd9c01da420fe70c37ee2b6be6a90d8311af27 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -103,6 +103,11 @@ private:
      */
     void addShowMenubarAction(KMenu* menu);
 
      */
     void addShowMenubarAction(KMenu* menu);
 

+    /**
+     * Returns a name for adding the URL \a url to the Places panel.
+     */
+    QString placesName(const KUrl& url) const;
+

 private:
     struct Entry
     {
 private:
     struct Entry
     {