Merge branch 'NewPrivateBrowsing' into NEWMASTER

2 files changed, 9 insertions, 11 deletions

diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 3ec0b2fa..1f4a0367 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -79,7 +79,6 @@ void IconButton::mouseReleaseEvent(QMouseEvent* event)
 UrlBar::UrlBar(QWidget *parent)
         : KLineEdit(parent)
         , _tab(0)
-        , _privateMode(false)
         , _icon(new IconButton(this))
         , _suggestionTimer(new QTimer(this))
 {
@@ -159,7 +158,7 @@ void UrlBar::paintEvent(QPaintEvent *event)
     QColor backgroundColor;
     QColor foregroundColor;
 
-    if (_privateMode)
+    if (QWebSettings::globalSettings()->testAttribute(QWebSettings::PrivateBrowsingEnabled))
     {
         backgroundColor = QColor(220, 220, 220);  // light gray
         foregroundColor = Qt::black;
@@ -289,12 +288,6 @@ void UrlBar::focusInEvent(QFocusEvent *event)
 }
 
 
-void UrlBar::setPrivateMode(bool on)
-{
-    _privateMode = on;
-}
-
-
 void UrlBar::dropEvent(QDropEvent *event)
 {
     KLineEdit::dropEvent(event);
@@ -505,8 +498,15 @@ void UrlBar::suggest()
 
 void UrlBar::refreshFavicon()
 {
+    if(QWebSettings::globalSettings()->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+    {
+        _icon->setIcon(KIcon("view-media-artist"));
+        return;
+    }
+    
     KUrl u = _tab->url();
-    if(u.scheme() == QL1S("about")) {
+    if(u.scheme() == QL1S("about")) 
+    {
         _icon->setIcon(KIcon("arrow-right"));
         return;
     }
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index dcd0ba5b..4cdd9d9c 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -89,7 +89,6 @@ public:
     explicit UrlBar(QWidget *parent = 0);
     ~UrlBar();
 
-    void setPrivateMode(bool on);
     void activateSuggestions(bool);
 
 public slots:
@@ -124,7 +123,6 @@ private:
 
     QWeakPointer<CompletionWidget> _box;
     WebTab *_tab;
-    bool _privateMode;
 
     IconButton *_icon;
     IconButtonPointerList _rightIconsList;