diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/dcc/DccFileTransfer.cpp | 13 | ||||
| -rw-r--r-- | src/modules/popupeditor/PopupEditorWindow.cpp | 5 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp index 2f3302521..7de19d38c 100644 --- a/src/modules/dcc/DccFileTransfer.cpp +++ b/src/modules/dcc/DccFileTransfer.cpp @@ -1035,13 +1035,6 @@ void DccSendThread::run() goto handle_system_error; break; case KviSSL::SyscallError: - if(written == 0) - { - raiseSSLError(); - postErrorEvent(KviError::RemoteEndClosedConnection); - goto exit_dcc; - } - else { int iSSLErr = m_pSSL->getLastError(true); if(iSSLErr != 0) @@ -2386,12 +2379,6 @@ bool DccFileTransfer::doResume(const char * filename, const char * port, quint64 if(!bFileNameMatches) { - // bad file name - if(!bPortMatches) - return false; // neither filename nor port match - - // port matches (this is very likely to be the right transfer) - if(!KVI_OPTION_BOOL(KviOption_boolAcceptBrokenFileNameDccResumeRequests)) { if(_OUTPUT_VERBOSE) diff --git a/src/modules/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp index 60b7741f6..572a8e7bd 100644 --- a/src/modules/popupeditor/PopupEditorWindow.cpp +++ b/src/modules/popupeditor/PopupEditorWindow.cpp @@ -450,15 +450,10 @@ void SinglePopupEditor::customContextMenuRequested(const QPoint & pos) __tr2qs_ctx("Paste Inside", "editor"), this, SLOT(contextPasteInside())) ->setEnabled(it && bIsMenu && m_pClipboard); - bool bSeparatorInserted = false; - m_pContextPopup->addSeparator(); - bSeparatorInserted = true; m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Prologue)), __tr2qs_ctx("New Menu Prologue", "editor"), this, SLOT(contextNewPrologue())); - if(!bSeparatorInserted) - m_pContextPopup->addSeparator(); m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Epilogue)), __tr2qs_ctx("New Menu Epilogue", "editor"), this, SLOT(contextNewEpilogue())); |