[Kde-pim] branches/work/kdab-post-4.0/kdepim

[Jaroslaw Staniek]

SVN commit 746872 by staniek:

revert this silly change applied by me before fixing 'SVN switch' problem

CCMAIL:kde-pim at kde.org
CCMAIL:marc at kdab.net



 M  +1 -1      kmail/keyresolver.cpp  
 M  +3 -1      libkleo/backends/qgpgme/qgpgmejob.cpp  


--- branches/work/kdab-post-4.0/kdepim/kmail/keyresolver.cpp #746871:746872
@@ -1358,7 +1358,7 @@
 std::vector<GpgME::Key> Kleo::KeyResolver::selectKeys( const QString & person, const QString & msg, const std::vector<GpgME::Key> & selectedKeys ) const {
   Kleo::KeySelectionDialog dlg( i18n("Encryption Key Selection"),
 				msg, selectedKeys,
-				Kleo::KeySelectionDialog::ValidTrustedEncryptionKeys,
+				Kleo::KeySelectionDialog::ValidEncryptionKeys,
 				true, true ); // multi-selection and "remember choice" box
 
   if ( dlg.exec() != QDialog::Accepted )
--- branches/work/kdab-post-4.0/kdepim/libkleo/backends/qgpgme/qgpgmejob.cpp #746871:746872
@@ -51,6 +51,8 @@
 #include <QStringList>
 #include <QEventLoop>
 
+#include <algorithm>
+
 #include <assert.h>
 #include <string.h>
 
@@ -188,7 +190,7 @@
     mPatterns[mPatternEndIndex] = mReplacedPattern;
     mReplacedPattern = 0;
   }
-  mChunkSize = qMin( chunksize, mNumPatterns );
+  mChunkSize = std::min( chunksize, mNumPatterns );
   mPatternStartIndex = 0;
   mPatternEndIndex = mChunkSize;
   mReplacedPattern = mPatterns[mPatternEndIndex];
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/