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

List:       kde-commits
Subject:    kdepim/certmanager/lib/ui
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-07-28 18:43:28
Message-ID: 20040728184328.9A86799EB () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

Fix Aegypten issue #169 (certificate selection dialog allows selection of invalid \
keys), pt.2: Can't circumvent the validity check by double-click-accept()ing the key \
anymore.


  M +7 -2      keyselectiondialog.cpp   1.22
  M +1 -0      keyselectiondialog.h   1.15


--- kdepim/certmanager/lib/ui/keyselectiondialog.cpp  #1.21:1.22
@@ -70,7 +70,7 @@
 #include <qlineedit.h>
 #include <qwhatsthis.h>
-//#include <qdatetime.h>
 #include <qpopupmenu.h>
 #include <qregexp.h>
+#include <qpushbutton.h>
 
 #include <algorithm>
@@ -385,5 +385,5 @@ void Kleo::KeySelectionDialog::init( boo
   connect( mKeyListView,
            SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const QPoint&,int)),
-           SLOT(accept()) );
+           SLOT(slotTryOk()) );
   connect( mKeyListView,
            SIGNAL(contextMenu(Kleo::KeyListViewItem*,const QPoint&)),
@@ -677,4 +677,9 @@ void Kleo::KeySelectionDialog::slotReche
 }
 
+void Kleo::KeySelectionDialog::slotTryOk() {
+  if ( actionButton( Ok )->isEnabled() )
+    slotOk();
+}
+
 void Kleo::KeySelectionDialog::slotOk() {
   if ( mCheckSelectionTimer->isActive() )

--- kdepim/certmanager/lib/ui/keyselectiondialog.h  #1.14:1.15
@@ -127,4 +127,5 @@ namespace Kleo {
     void slotRMB( Kleo::KeyListViewItem *, const QPoint & );
     void slotRecheckKey();
+    void slotTryOk();
     void slotOk();
     void slotCancel();


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