diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-06 11:38:24 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-06 11:38:24 -0500 |
commit | 9cb7d7318211f13d690fea92d13aca60b0ae7c5a (patch) | |
tree | fd6bf55096bd25c85a0a2a06c3f25dfb3b49ea2a /tdeio/tdeio | |
parent | ddbe23e90d6684548fe9a952b01b3d6cbaf60a7c (diff) | |
download | tdelibs-9cb7d7318211f13d690fea92d13aca60b0ae7c5a.tar.gz tdelibs-9cb7d7318211f13d690fea92d13aca60b0ae7c5a.zip |
Push the following patches to GIT from Bug 1499:
tdelibs: disable kfiledialogbox OK button if user has no permission on file
tdelibs: fix https loop
tdelibs: fix groups in kdialogpropertiesdialog
tdelibs: avoid assertion in tdeio karchive
Diffstat (limited to 'tdeio/tdeio')
-rw-r--r-- | tdeio/tdeio/karchive.cpp | 4 | ||||
-rw-r--r-- | tdeio/tdeio/tcpslavebase.cpp | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/tdeio/tdeio/karchive.cpp b/tdeio/tdeio/karchive.cpp index 0e8d6789d..b0e0dc6ab 100644 --- a/tdeio/tdeio/karchive.cpp +++ b/tdeio/tdeio/karchive.cpp @@ -588,7 +588,9 @@ const KArchiveEntry* KArchiveDirectory::entry( TQString name ) const void KArchiveDirectory::addEntry( KArchiveEntry* entry ) { - Q_ASSERT( !entry->name().isEmpty() ); + if( entry->name().isEmpty() ) { + return; + } if( m_entries[ entry->name() ] ) { kdWarning() << "KArchiveDirectory::addEntry: directory " << name() << " has entry " << entry->name() << " already" << endl; diff --git a/tdeio/tdeio/tcpslavebase.cpp b/tdeio/tdeio/tcpslavebase.cpp index e9707a76a..b4b3fa656 100644 --- a/tdeio/tdeio/tcpslavebase.cpp +++ b/tdeio/tdeio/tcpslavebase.cpp @@ -1095,7 +1095,13 @@ int TCPSlaveBase::verifyCertificate() TDEConfig *config = new TDEConfig("tdeioslaverc"); config->setGroup("Notification Messages"); - if (!config->readBoolEntry("WarnOnEnterSSLMode", true)) { + bool dialogBoxStatus = false; + if( config->hasKey("WarnOnEnterSSLMode") ) { + dialogBoxStatus = true; + } + bool keyStatus = config->readBoolEntry("WarnOnEnterSSLMode", true); + dialogBoxStatus = dialogBoxStatus && keyStatus; + if (!keyStatus) { config->deleteEntry("WarnOnEnterSSLMode"); config->sync(); d->kssl->settings()->setWarnOnEnter(false); @@ -1122,6 +1128,10 @@ int TCPSlaveBase::verifyCertificate() "showSSLInfoDialog(TQString,TDEIO::MetaData,int)", data, ignoretype, ignore); } + //Laurent: If we disable message box we can't click on KMessageBox::No + if(dialogBoxStatus) { + break; + } } while (result != KMessageBox::No); } |