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

List:       kde-commits
Subject:    extragear/sysadmin/muon/installer
From:       Jonathan Michael Thomas <echidnaman () kubuntu ! org>
Date:       2011-01-10 5:43:23
Message-ID: 20110110054323.118F2AC8B2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1213289 by jmthomas:

Ensure that we get to do our error handling in ApplicationBackend before \
MuonMainWindow has a chance to reload things behind our back in the case that \
handling an error means reloading the QApt backend. BUG:262712
FIXED-IN:1.0.0


 M  +2 -0      ApplicationBackend.cpp  
 M  +1 -0      ApplicationBackend.h  
 M  +4 -0      ApplicationWindow.cpp  


--- trunk/extragear/sysadmin/muon/installer/ApplicationBackend.cpp #1213288:1213289
@@ -215,6 +215,8 @@
     if (error != QApt::CommitError) {
         ++m_currentTransaction;
     }
+
+    emit errorSignal(error, details);
 }
 
 void ApplicationBackend::updateDownloadProgress(int percentage)
--- trunk/extragear/sysadmin/muon/installer/ApplicationBackend.h #1213288:1213289
@@ -92,6 +92,7 @@
     void reloadStarted();
     void reloadFinished();
     void workerEvent(QApt::WorkerEvent event, Transaction *app);
+    void errorSignal(QApt::ErrorCode code, const QVariantMap &details);
     void progress(Transaction *transaction, int progress);
     void transactionCancelled(Application *app);
 };
--- trunk/extragear/sysadmin/muon/installer/ApplicationWindow.cpp #1213288:1213289
@@ -89,6 +89,8 @@
             m_appBackend, SLOT(setBackend(QApt::Backend *)));
     connect(m_appBackend, SIGNAL(workerEvent(QApt::WorkerEvent, Transaction *)),
             this, SLOT(workerEvent(QApt::WorkerEvent)));
+    connect(m_appBackend, SIGNAL(errorSignal(QApt::ErrorCode, QVariantMap)),
+            this, SLOT(errorOccurred(QApt::ErrorCode, QVariantMap)));
     connect(m_appBackend, SIGNAL(appBackendReady()),
             this, SLOT(populateViews()));
     connect(m_appBackend, SIGNAL(reloadStarted()),
@@ -101,6 +103,8 @@
     // makes queuing things while committing possible
     disconnect(m_backend, SIGNAL(workerEvent(QApt::WorkerEvent)),
                this, SLOT(workerEvent(QApt::WorkerEvent)));
+    disconnect(m_backend, SIGNAL(errorOccurred(QApt::ErrorCode, QVariantMap)),
+               this, SLOT(errorOccurred(QApt::ErrorCode, QVariantMap)));
 
     setActionsEnabled();
 }


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