[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kfile
From:       Kevin Ottens <ervin () kde ! org>
Date:       2007-04-06 15:55:40
Message-ID: 1175874940.224041.4562.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 651114 by ervin:

Make it use always the same bookmark file. Now all the KFilePlacesModel 
instance are nicely synchronized accross applications.


 M  +2 -5      kfileplacesmodel.cpp  


--- trunk/KDE/kdelibs/kfile/kfileplacesmodel.cpp #651113:651114
@@ -62,12 +62,9 @@
 KFilePlacesModel::KFilePlacesModel(QObject *parent)
     : QAbstractItemModel(parent), d(new Private(this))
 {
-    QString basePath = KGlobal::mainComponent().componentName();
-    basePath.append("/bookmarks.xml");
-    const QString file = KStandardDirs::locateLocal("data", basePath);
+    const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml");
+    d->bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces", false);
 
-    d->bookmarkManager = KBookmarkManager::managerForFile(file, "dolphin", false);
-
     // Let's put some places in there if it's empty
     KBookmarkGroup root = d->bookmarkManager->root();
     if (root.first().isNull()) {
[prev in list] [next in list] [prev in thread] [next in thread]