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

List:       kde-commits
Subject:    [discover/Plasma/5.13] libdiscover/backends/PackageKitBackend: Merge branch 'Plasma/5.12' into Plasm
From:       Aleix Pol <null () kde ! org>
Date:       2018-06-21 17:14:11
Message-ID: E1fW39v-0001UU-W3 () code ! kde ! org
[Download RAW message or body]

Git commit 32b1b3e96596bc4f74941de28013c3bb01b78720 by Aleix Pol.
Committed on 21/06/2018 at 17:13.
Pushed by apol into branch 'Plasma/5.13'.

Merge branch 'Plasma/5.12' into Plasma/5.13

M  +18   -10   libdiscover/backends/PackageKitBackend/PKTransaction.cpp
M  +3    -3    libdiscover/backends/PackageKitBackend/PackageKitResource.cpp
M  +4    -2    libdiscover/backends/PackageKitBackend/PackageKitUpdater.cpp

https://commits.kde.org/discover/32b1b3e96596bc4f74941de28013c3bb01b78720

diff --cc libdiscover/backends/PackageKitBackend/PKTransaction.cpp
index 1431b039,22066789..b8b67387
--- a/libdiscover/backends/PackageKitBackend/PKTransaction.cpp
+++ b/libdiscover/backends/PackageKitBackend/PKTransaction.cpp
@@@ -93,12 -93,10 +93,13 @@@ void PKTransaction::trigger(PackageKit:
      connect(m_trans.data(), &PackageKit::Transaction::mediaChangeRequired=
, this, &PKTransaction::mediaChange);
      connect(m_trans.data(), &PackageKit::Transaction::requireRestart, thi=
s, &PKTransaction::requireRestart);
      connect(m_trans.data(), &PackageKit::Transaction::repoSignatureRequir=
ed, this, &PKTransaction::repoSignatureRequired);
-     connect(m_trans.data(), &PackageKit::Transaction::itemProgress, this,=
 &PKTransaction::progressChanged);
+     connect(m_trans.data(), &PackageKit::Transaction::percentageChanged, =
this, &PKTransaction::progressChanged);
+     connect(m_trans.data(), &PackageKit::Transaction::statusChanged, this=
, &PKTransaction::statusChanged);
      connect(m_trans.data(), &PackageKit::Transaction::eulaRequired, this,=
 &PKTransaction::eulaRequired);
      connect(m_trans.data(), &PackageKit::Transaction::allowCancelChanged,=
 this, &PKTransaction::cancellableChanged);
 +    connect(m_trans.data(), &PackageKit::Transaction::speedChanged, this,=
 [this]() {
 +        setDownloadSpeed(m_trans->speed());
 +    });
      =

      setCancellable(m_trans->allowCancel());
  }
[prev in list] [next in list] [prev in thread] [next in thread]