aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2014-06-05 19:08:47 +0000
committernils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2014-06-05 19:08:47 +0000
commitdf543fadd41a89a53b7dcd14c7c6e062a3fe2c47 (patch)
tree7de3be7b360520a2750946b3d1e7509429d0608f
parentmerged r1089 from branch/0.4-beta (display helpfile of diefferent languages) (diff)
downloadgpg4usb-df543fadd41a89a53b7dcd14c7c6e062a3fe2c47.tar.gz
gpg4usb-df543fadd41a89a53b7dcd14c7c6e062a3fe2c47.zip
changed remove double linebreaks to old behaviour (without attention to signatures)
git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.3@1112 34ebc366-c3a9-4b3c-9f84-69acf7962910
-rw-r--r--mainwindow.cpp20
1 files changed, 1 insertions, 19 deletions
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 3041150..381b1b4 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -960,25 +960,7 @@ void MainWindow::cleanDoubleLinebreaks()
}
QString content = edit->curTextPage()->toPlainText();
-
- /**
- * make sure to not remove parts of signature
- */
- int start = content.indexOf(GpgConstants::PGP_SIGNED_BEGIN);
- int startSig = content.indexOf(GpgConstants::PGP_SIGNATURE_BEGIN);
-
- bool isSignature = false;
- if(start > -1 || startSig > -1 ) {
- isSignature=true;
- }
-
- if(isSignature) {
- // cut between start+next \n and startSig, replace \n\n and then insert between
- // start+next \n and startSig
- } else {
- content.replace("\n\n", "\n");
- }
-
+ content.replace("\n\n", "\n");
edit->fillTextEditWithText(content);
}