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

List:       kde-commits
Subject:    KDE/kdelibs/khtml
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-05-04 16:38:06
Message-ID: 1146760686.497351.16495.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 537376 by mueller:

don't allow to find text in password fields


 M  +5 -3      khtml_part.cpp  


--- trunk/KDE/kdelibs/khtml/khtml_part.cpp #537375:537376
@@ -3149,7 +3149,8 @@
         else if ( renderLineText )
         {
           khtml::RenderLineEdit *parentLine= static_cast<khtml::RenderLineEdit \
                *>(obj);
-          s = parentLine->widget()->text();
+          if (parentLine->widget()->echoMode() == QLineEdit::Normal)
+            s = parentLine->widget()->text();
           s = s.replace(0xa0, ' ');
         }
         else if ( obj->isText() )
@@ -3459,7 +3460,8 @@
 	    text += static_cast<HTMLTextAreaElementImpl*>(n.handle())->value().string();
 	    break;
 	  case ID_INPUT:
-	    text += static_cast<HTMLInputElementImpl*>(n.handle())->value().string();
+            if (static_cast<HTMLInputElementImpl*>(n.handle())->inputType() != \
HTMLInputElementImpl::PASSWORD) +  	      text += \
static_cast<HTMLInputElementImpl*>(n.handle())->value().string();  break;
 	  case ID_SELECT:
 	    text += static_cast<HTMLSelectElementImpl*>(n.handle())->value().string();
@@ -4465,7 +4467,7 @@
     }
 
     child->m_serviceType = mimetype;
-    if ( child->m_frame )
+    if ( child->m_frame  && part->widget() )
       child->m_frame->setWidget( part->widget() );
 
     if ( child->m_type != khtml::ChildFrame::Object )


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