[PATCH 6 of 6] Always include previous certificates in choices for the installer

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1403797372 -7200
# Node ID 7147550ee15d5ce9ea275d2918770ce5c2e0958a
# Parent  ef6d3dc9e930f3d539d335343042c43fdd793ca2
Always include previous certificates in choices for the installer

diff -r ef6d3dc9e930 -r 7147550ee15d ui/mainwindow.cpp
--- a/ui/mainwindow.cpp	Thu Jun 26 17:42:24 2014 +0200
+++ b/ui/mainwindow.cpp	Thu Jun 26 17:42:52 2014 +0200
@@ -939,7 +939,12 @@
     choices << mUpdatesNew->selectedCertificates();
     choices << mUpdatesRemove->selectedCertificates();
 
-    choices <<  mUpdatesManual->selectedCertificates();
+    choices << mUpdatesManual->selectedCertificates();
+
+    /* Also include the old certificates */
+    choices << mInstallList->selectedCertificates();
+    choices << mRemoveList->selectedCertificates();
+
     QStringList unselectedManuals = mUpdatesManual->unselectedCertificates();
     for(int i = 0; i < unselectedManuals.size(); i++) {
         if (unselectedManuals.at(i).startsWith("I:")) {