[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml
From:       George Staikos <staikos () kde ! org>
Date:       2005-10-23 23:13:29
Message-ID: 1130109209.444030.26125.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 473523 by staikos:

no longer handle the half-locked case


 M  +6 -15     khtml_part.cpp  
 M  +1 -2      khtmlpart_p.h  


--- trunk/KDE/kdelibs/khtml/khtml_part.cpp #473522:473523
@@ -6,7 +6,7 @@
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
- *                     2001-2003 George Staikos <staikos@kde.org>
+ *                     2001-2005 George Staikos <staikos@kde.org>
  *                     2001-2003 Dirk Mueller <mueller@kde.org>
  *                     2000-2005 David Faure <faure@kde.org>
  *                     2002 Apple Computer, Inc.
@@ -245,7 +245,6 @@
   d->m_statusBarPopupLabel = 0L;
   d->m_openableSuppressedPopups = 0;
 
-  d->m_bSecurityInQuestion = false;
   d->m_paLoadImages = 0;
   d->m_paDebugScript = 0;
   d->m_bMousePressed = false;
@@ -1540,7 +1539,10 @@
 
   QString iconName;
   switch (sec)  {
-  case NotCrypted:
+  case Encrypted:
+    iconName = "encrypted";
+    break;
+  default:
     iconName = "decrypted";
     if ( d->m_statusBarIconLabel )  {
       d->m_statusBarExtension->removeStatusBarItem( d->m_statusBarIconLabel );
@@ -1548,12 +1550,6 @@
       d->m_statusBarIconLabel = 0L;
     }
     break;
-  case Encrypted:
-    iconName = "encrypted";
-    break;
-  case Mixed:
-    iconName = "halfencrypted";
-    break;
   }
   d->m_paSecurity->setIcon( iconName );
   if ( d->m_statusBarIconLabel )
@@ -1594,7 +1590,6 @@
     d->m_pageServices = d->m_job->queryMetaData("PageServices");
     d->m_pageReferrer = d->m_job->queryMetaData("referrer");
 
-    d->m_bSecurityInQuestion = false;
     d->m_ssl_in_use = (d->m_job->queryMetaData("ssl_in_use") == "TRUE");
 
     {
@@ -1602,8 +1597,7 @@
     if (p && p->d->m_ssl_in_use != d->m_ssl_in_use) {
 	while (p->parentPart()) p = p->parentPart();
 
-        p->setPageSecurity( Mixed );
-        p->d->m_bSecurityInQuestion = true;
+        p->setPageSecurity( NotCrypted );
     }
     }
 
@@ -4120,9 +4114,6 @@
 
   KSSLInfoDlg *kid = new KSSLInfoDlg(d->m_ssl_in_use, widget(), "kssl_info_dlg", true );
 
-  if (d->m_bSecurityInQuestion)
-	  kid->setSecurityInQuestion(true);
-
   if (d->m_ssl_in_use) {
     KSSLCertificate *x = KSSLCertificate::fromString(d->m_ssl_peer_certificate.toLocal8Bit());
     if (x) {
--- trunk/KDE/kdelibs/khtml/khtmlpart_p.h #473522:473523
@@ -9,7 +9,7 @@
  *                     2000-2001 Simon Hausmann <hausmann@kde.org>
  *                     2000-2001 Dirk Mueller <mueller@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
- *                     2001-2003 George Stiakos <staikos@kde.org>
+ *                     2001-2005 George Staikos <staikos@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -463,7 +463,6 @@
   bool m_bFirstData:1;
   bool m_bClearing:1;
   bool m_bCleared:1;
-  bool m_bSecurityInQuestion:1;
   bool m_focusNodeRestored:1;
 
   int m_focusNodeNumber;
[prev in list] [next in list] [prev in thread] [next in thread]