Ubuntu Pastebin

Paste from a at Mon, 4 May 2015 13:39:37 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
Description: update places config file path lookup
 both kio(kf5) and kde4libs are having had their support for legacy file sync
 removed. this sync previously would allow the legacy kfileplaces/bookmarks.xml
 file to be used instead of the since preferred user-places.xbel file.
 this sync support had to be removed to resolve an issue with kf5/kde4libs
 inter-operability. this patch simply adjusts the lookup path to use the
 new file rather than the old one.
 https://bugs.kde.org/show_bug.cgi?id=345174
Author: Harald Sitter <sitter@kde.org>
Origin: vendor
Bug-Kubuntu: https://bugs.launchpad.net/kdenlive/+bug/1422469
Forwarded: https://git.reviewboard.kde.org/r/123628/
Reviewed-by: <name and email of a reviewer, optional>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: kdenlive-0.9.10/src/doc/kdenlivedoc.cpp
===================================================================
--- kdenlive-0.9.10.orig/src/doc/kdenlivedoc.cpp
+++ kdenlive-0.9.10/src/doc/kdenlivedoc.cpp
@@ -1654,7 +1654,7 @@ void KdenliveDoc::updateProjectFolderPla
      * http://websvn.kde.org/trunk/KDE/kdelibs/kfile/kfileplacesmodel.cpp?view=markup
      */
 
-    const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml");
+    const QString file = KStandardDirs().localxdgdatadir() + "user-places.xbel";
     KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces");
     if (!bookmarkManager) return;
     KBookmarkGroup root = bookmarkManager->root();
Download as text