summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2013-09-05 11:55:37 +0000
committerMichael Palimaka <kensington@gentoo.org>2013-09-05 11:55:37 +0000
commit4d0f28056fef91574d0feaf6cd16186b82d2b804 (patch)
treedba710affbf5319f23383e237e7600f62adc2e33 /kde-base/konqueror/files
parentdrop old (diff)
downloadhistorical-4d0f28056fef91574d0feaf6cd16186b82d2b804.tar.gz
historical-4d0f28056fef91574d0feaf6cd16186b82d2b804.tar.bz2
historical-4d0f28056fef91574d0feaf6cd16186b82d2b804.zip
Backport patch from upstream fixing an issue where top level bookmarks do not appear in the toolbar, wrt bug #483666.
Package-Manager: portage-2.2.1/cvs/Linux x86_64 Manifest-Sign-Key: 0x675D0D2C
Diffstat (limited to 'kde-base/konqueror/files')
-rw-r--r--kde-base/konqueror/files/konqueror-4.11.1-bookmarks.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/kde-base/konqueror/files/konqueror-4.11.1-bookmarks.patch b/kde-base/konqueror/files/konqueror-4.11.1-bookmarks.patch
new file mode 100644
index 000000000000..66aae072473b
--- /dev/null
+++ b/kde-base/konqueror/files/konqueror-4.11.1-bookmarks.patch
@@ -0,0 +1,31 @@
+From 43a981481ab9161a83dd200db39c093e2502f68a Mon Sep 17 00:00:00 2001
+From: Bernd Buschinski <b.buschinski@googlemail.com>
+Date: Wed, 4 Sep 2013 16:23:35 +0200
+Subject: [PATCH] Fix toplevel bookmarks not showing in toolbar regression from
+ d1963e23
+
+---
+ konqueror/src/konqbookmarkbar.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/konqueror/src/konqbookmarkbar.cpp b/konqueror/src/konqbookmarkbar.cpp
+index 2141575..199e15f 100644
+--- a/konqueror/src/konqbookmarkbar.cpp
++++ b/konqueror/src/konqbookmarkbar.cpp
+@@ -184,10 +184,12 @@ void KBookmarkBar::fillBookmarkBar(const KBookmarkGroup & parent)
+
+ if (!bm.isGroup())
+ {
+- if ( bm.isSeparator() )
++ if ( bm.isSeparator() )
++ {
+ if (m_toolBar) {
+ m_toolBar->addSeparator();
+ }
++ }
+ else
+ {
+ KAction *action = new KBookmarkAction( bm, m_pOwner, 0 );
+--
+1.8.3.2
+