[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/libs/libqapt/utils/qapt-batch
From:       Jonathan Michael Thomas <echidnaman () kubuntu ! org>
Date:       2010-06-10 2:59:15
Message-ID: 20100610025915.86CE6AC8CF () svn ! kde ! org
[Download RAW message or body]

SVN commit 1136491 by jmthomas:

Since answering "No" to the InstallUntrusted warning is an unusual pseudo-error, we \
need to close the dialog after we've responded to the worker.


 M  +8 -5      qaptbatch.cpp  


--- trunk/playground/libs/libqapt/utils/qapt-batch/qaptbatch.cpp #1136490:1136491
@@ -226,7 +226,7 @@
                      untrustedItems.size());
         int result = KMessageBox::No;
         bool installUntrusted = false;
-        kDebug() << "asking";
+
         result = KMessageBox::warningYesNoList(0, text,
                                                untrustedItems, title);
         switch (result) {
@@ -237,11 +237,15 @@
                 installUntrusted = false;
                 break;
         }
-        kDebug() << installUntrusted;
+
         response["InstallUntrusted"] = installUntrusted;
         m_worker->answerWorkerQuestion(response);
+
+        if(!installUntrusted) {
+            close();
     }
 }
+}
 
 void QAptBatch::raiseErrorMessage(const QString &text, const QString &title)
 {
@@ -307,13 +311,12 @@
 
 void QAptBatch::workerFinished(bool success)
 {
-    Q_UNUSED(success);
     disconnect(m_watcher, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
                this, SLOT(serviceOwnerChanged(QString, QString, QString)));
 
-    connect(m_worker, SIGNAL(downloadProgress(int, int, int)),
+    disconnect(m_worker, SIGNAL(downloadProgress(int, int, int)),
             this, SLOT(updateDownloadProgress(int, int, int)));
-    connect(m_worker, SIGNAL(commitProgress(const QString&, int)),
+    disconnect(m_worker, SIGNAL(commitProgress(const QString&, int)),
             this, SLOT(updateCommitProgress(const QString&, int)));
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]