From 74d146ead6ac5c259d15bfecda80b6e3185bb492 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Sun, 12 Jun 2011 09:54:36 +0200
Subject: [PATCH] SSL Certficate Error is now shown in non-blocking javascript
 prompt

---
 src/icon.ico                    | Bin 9662 -> 0 bytes
 src/navigation/locationbar.cpp  |   4 ++--
 src/network/networkmanager.cpp  |  15 ++++++++++++---
 src/tools/buttonwithmenu.cpp    |   2 +-
 src/tools/closedtabsmanager.cpp |   4 +---
 5 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 src/icon.ico

diff --git a/src/icon.ico b/src/icon.ico
deleted file mode 100644
index acd93a8a34942eb780199d6f7db89e6f705e08c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9662
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
RUj+UC@&5$_dt?&w{-5?6y+Hr~

diff --git a/src/navigation/locationbar.cpp b/src/navigation/locationbar.cpp
index cc7fe9015..165d0739f 100644
--- a/src/navigation/locationbar.cpp
+++ b/src/navigation/locationbar.cpp
@@ -215,7 +215,7 @@ void LocationBar::setPrivacy(bool state)
 void LocationBar::focusOutEvent(QFocusEvent* e)
 {
     QLineEdit::focusOutEvent(e);
-    if (!selectedText().isEmpty()  && e->reason() != Qt::TabFocusReason)
+    if (!selectedText().isEmpty() && e->reason() != Qt::TabFocusReason)
         return;
     setCursorPosition(0);
     hideGoButton();
@@ -232,7 +232,7 @@ void LocationBar::dropEvent(QDropEvent* event)
             return;
         }
     }
-    if (event->mimeData()->hasText()) {
+    else if (event->mimeData()->hasText()) {
         QUrl dropUrl = QUrl(event->mimeData()->text());
         if (WebView::isUrlValid(dropUrl)) {
             setText(dropUrl.toString());
diff --git a/src/network/networkmanager.cpp b/src/network/networkmanager.cpp
index 32c1c2953..e915d7413 100644
--- a/src/network/networkmanager.cpp
+++ b/src/network/networkmanager.cpp
@@ -90,6 +90,13 @@ void NetworkManager::sslError(QNetworkReply* reply, QList<QSslError> errors)
         reply->ignoreSslErrors(errors);
         return;
     }
+
+    QNetworkRequest request = reply->request();
+    QVariant v = request.attribute((QNetworkRequest::Attribute)(QNetworkRequest::User + 100));
+    WebPage* webPage = (WebPage*)(v.value<void*>());
+    if (!webPage)
+        return;
+
     QString title = tr("SSL Certificate Error!");
     QString text1 = tr("The page you trying to access has following errors in SSL Certificate:");
 
@@ -112,9 +119,11 @@ void NetworkManager::sslError(QNetworkReply* reply, QList<QSslError> errors)
     QString message = QString(QLatin1String("<b>%1</b><p>%2</p><ul><li>%3</li></ul><p>%4</p>")).arg(title, text1, actions.join(QLatin1String("</li><li>")), text2);
 
     if (!actions.isEmpty())  {
-        QMessageBox::StandardButton button = QMessageBox::critical(p_QupZilla, tr("SSL Certificate Error"),
-                                                               message, QMessageBox::Yes | QMessageBox::No);
-        if (button != QMessageBox::Yes)
+//        QMessageBox::StandardButton button = QMessageBox::critical(p_QupZilla, tr("SSL Certificate Error"),
+//                                                               message, QMessageBox::Yes | QMessageBox::No);
+//        if (button != QMessageBox::Yes)
+//            return;
+        if (!webPage->javaScriptConfirm(webPage->mainFrame(), message))
             return;
     }
 
diff --git a/src/tools/buttonwithmenu.cpp b/src/tools/buttonwithmenu.cpp
index d5d8469ef..46631d7af 100644
--- a/src/tools/buttonwithmenu.cpp
+++ b/src/tools/buttonwithmenu.cpp
@@ -48,7 +48,7 @@ void ButtonWithMenu::removeItem(const Item &item)
     m_items.removeOne(item);
 
     if (*m_currentItem == item)
-        setActiveItem(m_items.takeFirst());
+        setActiveItem(m_items.first());
 
     generateMenu();
 }
diff --git a/src/tools/closedtabsmanager.cpp b/src/tools/closedtabsmanager.cpp
index e79567ef4..272b2b3fa 100644
--- a/src/tools/closedtabsmanager.cpp
+++ b/src/tools/closedtabsmanager.cpp
@@ -24,10 +24,8 @@ void ClosedTabsManager::saveView(WebView* view)
 ClosedTabsManager::Tab ClosedTabsManager::getFirstClosedTab()
 {
     Tab tab;
-    if (m_closedTabs.count() > 0) {
+    if (m_closedTabs.count() > 0)
         tab = m_closedTabs.takeFirst();
-        m_closedTabs.removeOne(tab);
-    }
 
     return tab;
 }