From ed7812965d92d4128329cc903b2af1a34590a17b Mon Sep 17 00:00:00 2001
From: Christoph Feck <christoph@maxiom.de>
Date: Sun, 9 Jan 2011 15:18:44 +0100
Subject: SVN_SILENT compile

---
 src/webpage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
     
-- 
cgit v1.2.1


From 56760880eb0d02ac97d0beeb862f53662c49fce9 Mon Sep 17 00:00:00 2001
From: Felix Rohrbach <fxrh@gmx.de>
Date: Sun, 9 Jan 2011 15:25:48 +0100
Subject: Readds a config option in the tab settings window.

This config option was accedentially removed in commit cb84ae8badcab5bfe095e71cf4c0e33175e60817.
---
 src/settings/settings_tabs.ui | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/settings/settings_tabs.ui b/src/settings/settings_tabs.ui
index 290c6274..29b7377f 100644
--- a/src/settings/settings_tabs.ui
+++ b/src/settings/settings_tabs.ui
@@ -190,6 +190,13 @@
         </property>
        </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">
-- 
cgit v1.2.1