Attachment #1242 for bug #1499

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1499
Collapse All | Expand All

Lines 3-8 Link Here

(-)./libkonq/konqbookmarkmanager.h.ori (-1 / +10 lines)
3		3
4	#include <kbookmarkmanager.h>	4	#include <kbookmarkmanager.h>
5	#include <kstandarddirs.h>	5	#include <kstandarddirs.h>
		6	#include <kurl.h>
		7	#include <kio/job.h>
6	#include <libkonq_export.h>	8	#include <libkonq_export.h>
7		9
8	class LIBKONQ_EXPORT KonqBookmarkManager	10	class LIBKONQ_EXPORT KonqBookmarkManager
Lines 11-17 Link Here
11	static KBookmarkManager * self() {	13	static KBookmarkManager * self() {
12	if ( !s_bookmarkManager )	14	if ( !s_bookmarkManager )
13	{	15	{
14	TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));	16	TQString globalBookmarkFile = locate( "data", TQString::fromLatin1( "konqueror/bookmarks.xml" ) );
		17	TQString bookmarksFile = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml" ), true);
		18	if ( globalBookmarkFile != TQString::null && bookmarksFile == TQString::null ) {
		19	KIO::file_copy(
		20	KURL::fromPathOrURL( globalBookmarkFile ),
		21	KURL::fromPathOrURL( bookmarksFile ), -1, false, false
		22	);
		23	}
15	s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );	24	s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
16	}	25	}
17	return s_bookmarkManager;	26	return s_bookmarkManager;

Return to bug 1499