Attachment 578566 Details for Bug 752564 – [PATCH] Don't ask for updates twice

[patch] [PATCH] Don't ask for updates twice

apper-0.7.1-wakeups_2.patch (text/plain), 2.66 KB, created by Martin Kho on 2012-04-19 10:15:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Kho

Created: 2012-04-19 10:15:51 UTC

Size: 2.66 KB

patch

obsolete

>diff -Nur apper-0.7.1.orig/apperd/apperd.cpp apper-0.7.1/apperd/apperd.cpp
>--- apper-0.7.1.orig/apperd/apperd.cpp	2012-04-19 11:57:55.858962696 +0200
>+++ apper-0.7.1/apperd/apperd.cpp	2012-04-19 11:59:51.942937140 +0200
>@@ -56,6 +56,19 @@
>     connect(m_qtimer, SIGNAL(timeout()), this, SLOT(poll()));
>     m_qtimer->start(FIVE_MIN);
> 
>+    // Make sure we know is Sentinel is running
>+    QDBusServiceWatcher *watcher;
>+    watcher = new QDBusServiceWatcher(QLatin1String("org.kde.ApperSentinel"),
>+                                      QDBusConnection::sessionBus(),
>+                                      QDBusServiceWatcher::WatchForOwnerChange,
>+                                      this);
>+    connect(watcher, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
>+            this, SLOT(serviceOwnerChanged(QString,QString,QString)));
>+
>+    // Check if Sentinel is running
>+    m_sentinelIsRunning = nameHasOwner(QLatin1String("org.kde.ApperSentinel"),
>+                                       QDBusConnection::sessionBus());
>+
>     // Watch for TransactionListChanged so we start sentinel
>     QDBusConnection::systemBus().connect(QLatin1String(""),
>                                          QLatin1String(""),
>@@ -81,19 +94,6 @@
>     connect(confWatch, SIGNAL(deleted(QString)), this, SLOT(configFileChanged()));
>     confWatch->startScan();
> 
>-    // Make sure we know is Sentinel is running
>-    QDBusServiceWatcher *watcher;
>-    watcher = new QDBusServiceWatcher(QLatin1String("org.kde.ApperSentinel"),
>-                                      QDBusConnection::sessionBus(),
>-                                      QDBusServiceWatcher::WatchForOwnerChange,
>-                                      this);
>-    connect(watcher, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
>-            this, SLOT(serviceOwnerChanged(QString,QString,QString)));
>-
>-    // Check if Sentinel is running
>-    m_sentinelIsRunning = nameHasOwner(QLatin1String("org.kde.ApperSentinel"),
>-                                       QDBusConnection::sessionBus());
>-
>     // if PackageKit is running check to see if there are running transactons already
>     if (!m_sentinelIsRunning && nameHasOwner(QLatin1String("org.freedesktop.PackageKit"),
>                                              QDBusConnection::systemBus())) {
>@@ -174,8 +174,10 @@
> {
>     // - update time since last refresh
>     // - reset showed updates to display this change
>-    getTimeSinceRefreshCache();
>-    m_showedUpdates = false;
>+    if (!m_sentinelIsRunning) {
>+        getTimeSinceRefreshCache();
>+        m_showedUpdates = false;
>+    }
> }
> 
> void ApperD::serviceOwnerChanged(const QString &serviceName, const QString &oldOwner, const QString &newOwner)

Actions: View | Diff

Attachments on bug 752564: 577327 | 577834 | 578566 | 579163