summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2011-01-09 17:56:37 +0100
committerAndrea Diamantini <adjam7@gmail.com>2011-01-09 17:56:37 +0100
commit0d99649cf995cef0cefd8add90ae6b12c47d34b4 (patch)
tree4de15fd062641f7b81b9764dab7581e53dc5ca17
parentFix the always opened tabbar feature. (diff)
parentReadds a config option in the tab settings window. (diff)
downloadrekonq-0d99649cf995cef0cefd8add90ae6b12c47d34b4.tar.xz
Merge branch 'master' of git.kde.org:rekonq
-rw-r--r--src/settings/settings_tabs.ui7
-rw-r--r--src/webpage.cpp2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/settings/settings_tabs.ui b/src/settings/settings_tabs.ui
index 01e885eb..dd340700 100644
--- a/src/settings/settings_tabs.ui
+++ b/src/settings/settings_tabs.ui
@@ -198,6 +198,13 @@
</widget>
</item>
<item>
+ <widget class="QCheckBox" name="kcfg_alwaysShowTabBar">
+ <property name="text">
+ <string>Always show tab bar</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QCheckBox" name="kcfg_openTabsBack">
<property name="text">
<string>Open new tabs in the background</string>
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 63a7747c..47056216 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -386,7 +386,7 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
#if KDE_IS_VERSION( 4, 5, 96)
kDebug() << "PUT REPLY ON HOLD...";
KIO::Integration::AccessManager::putReplyOnHold(reply);
- #elseif
+ #else
reply->abort();
#endif