Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

1 files changed, 0 insertions, 27 deletions

diff --git a/redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch b/redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch
deleted file mode 100644
index b9b0ec5fa..000000000
--- a/redhat/tdebase/tdebase-3.5.13.2-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 <kio/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 ) {
-+                KIO::file_copy( 
-+                   KURL::fromPathOrURL( globalBookmarkFile ), 
-+                   KURL::fromPathOrURL( bookmarksFile ), -1, false, false
-+                );
-+            }
-             s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
-         }
-         return s_bookmarkManager;