diff options
author | François Andriot <albator78@libertysurf.fr> | 2014-06-18 19:32:01 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2014-06-18 19:32:01 +0200 |
commit | 470510a717da8d95508202f27e28b23c88f5d7e7 (patch) | |
tree | 34ed8f8bcdba47c542912e1bee359052c3baf3f7 /redhat/tdebase/tdebase-14.0.0-bookmark_global_copy.patch | |
parent | b17dd09e6a6628e9058fadc586e14b7a1f1724bb (diff) | |
download | tde-packaging-470510a717da8d95508202f27e28b23c88f5d7e7.tar.gz tde-packaging-470510a717da8d95508202f27e28b23c88f5d7e7.zip |
RPM packaging: update tdebase R14
Diffstat (limited to 'redhat/tdebase/tdebase-14.0.0-bookmark_global_copy.patch')
-rw-r--r-- | redhat/tdebase/tdebase-14.0.0-bookmark_global_copy.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/redhat/tdebase/tdebase-14.0.0-bookmark_global_copy.patch b/redhat/tdebase/tdebase-14.0.0-bookmark_global_copy.patch deleted file mode 100644 index 0f8a68045..000000000 --- a/redhat/tdebase/tdebase-14.0.0-bookmark_global_copy.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- ./libkonq/konqbookmarkmanager.h.ori 2013-05-08 23:26:03.558587419 +0200 -+++ ./libkonq/konqbookmarkmanager.h 2013-05-08 23:29:25.317517880 +0200 -@@ -3,6 +3,8 @@ - - #include <kbookmarkmanager.h> - #include <kstandarddirs.h> -+#include <kurl.h> -+#include <tdeio/job.h> - #include <libkonq_export.h> - - class LIBKONQ_EXPORT KonqBookmarkManager -@@ -11,7 +13,14 @@ - static KBookmarkManager * self() { - if ( !s_bookmarkManager ) - { -- TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); -+ TQString globalBookmarkFile = locate( "data", TQString::fromLatin1( "konqueror/bookmarks.xml" ) ); -+ TQString bookmarksFile = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml" ), true); -+ if ( globalBookmarkFile != TQString::null && bookmarksFile == TQString::null ) { -+ TDEIO::file_copy( -+ KURL::fromPathOrURL( globalBookmarkFile ), -+ KURL::fromPathOrURL( bookmarksFile ), -1, false, false -+ ); -+ } - s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile ); - } - return s_bookmarkManager; |