Hello community, here is the log from the commit of package kactivitymanagerd for openSUSE:Factory checked in at 2016-08-29 15:24:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivitymanagerd (Old) and /work/SRC/openSUSE:Factory/.kactivitymanagerd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivitymanagerd" Changes: -------- --- /work/SRC/openSUSE:Factory/kactivitymanagerd/kactivitymanagerd.changes 2016-08-12 15:38:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kactivitymanagerd.new/kactivitymanagerd.changes 2016-08-29 15:25:00.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 26 20:36:41 UTC 2016 - fab...@ritter-vogt.de + +- Update to 5.7.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.4.php + +------------------------------------------------------------------- Old: ---- kactivitymanagerd-5.7.3.tar.xz New: ---- kactivitymanagerd-5.7.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivitymanagerd.spec ++++++ --- /var/tmp/diff_new_pack.Ot4DXR/_old 2016-08-29 15:25:01.000000000 +0200 +++ /var/tmp/diff_new_pack.Ot4DXR/_new 2016-08-29 15:25:01.000000000 +0200 @@ -18,7 +18,7 @@ %bcond_without lang Name: kactivitymanagerd -Version: 5.7.3 +Version: 5.7.4 Release: 0 Summary: KDE Plasma Activities support License: GPL-2.0+ ++++++ kactivitymanagerd-5.7.3.tar.xz -> kactivitymanagerd-5.7.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivitymanagerd-5.7.3/src/service/Activities.cpp new/kactivitymanagerd-5.7.4/src/service/Activities.cpp --- old/kactivitymanagerd-5.7.3/src/service/Activities.cpp 2016-08-02 11:33:21.000000000 +0200 +++ new/kactivitymanagerd-5.7.4/src/service/Activities.cpp 2016-08-23 14:36:10.000000000 +0200 @@ -204,7 +204,7 @@ emit q->ActivityAdded(activity); - scheduleConfigSync(true); + scheduleConfigSync(); if (activitiesCount == 1) { q->SetCurrentActivity(activity); @@ -264,24 +264,22 @@ QMetaObject::invokeMethod(this, "configSync", Qt::QueuedConnection); } -void Activities::Private::scheduleConfigSync(const bool soon) +void Activities::Private::scheduleConfigSync() { static const auto shortInterval = 1000; - static const auto longInterval = 2 * 60 * 1000; // If the timer is not running, or has a longer interval than we need, // start it - if ((soon && configSyncTimer.interval() > shortInterval) - || !configSyncTimer.isActive()) { - + if (!configSyncTimer.isActive()) { QMetaObject::invokeMethod( &configSyncTimer, "start", Qt::QueuedConnection, - Q_ARG(int, soon ? shortInterval : longInterval)); + Q_ARG(int, shortInterval)); } } void Activities::Private::configSync() { + // Stop the timer and reset the interval to zero QMetaObject::invokeMethod(&configSyncTimer, "stop", Qt::QueuedConnection); config.sync(); } @@ -396,6 +394,7 @@ // Initializing config + qDebug() << "Config timer connecting..."; d->connect(&d->configSyncTimer, SIGNAL(timeout()), SLOT(configSync()), Qt::QueuedConnection); @@ -432,7 +431,9 @@ QString Activities::AddActivity(const QString &name) { - if (!KAuthorized::authorize("plasma-desktop/add_activities")) { + // We do not care about authorization if this is the first start + if (!d->activities.isEmpty() && + !KAuthorized::authorize("plasma-desktop/add_activities")) { return QString(); } @@ -503,7 +504,7 @@ } \ \ d->activity##What##Config().writeEntry(activity, value); \ - d->scheduleConfigSync(true); \ + d->scheduleConfigSync(); \ \ emit Activity##What##Changed(activity, value); \ emit ActivityChanged(activity); \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivitymanagerd-5.7.3/src/service/Activities_p.h new/kactivitymanagerd-5.7.4/src/service/Activities_p.h --- old/kactivitymanagerd-5.7.3/src/service/Activities_p.h 2016-08-02 11:33:21.000000000 +0200 +++ new/kactivitymanagerd-5.7.4/src/service/Activities_p.h 2016-08-23 14:36:10.000000000 +0200 @@ -113,9 +113,7 @@ public Q_SLOTS: // Schedules config syncing to be done after // a predefined time interval - // if soon == true, the syncing is performed - // after a few seconds, otherwise a few minutes - void scheduleConfigSync(const bool soon = false); + void scheduleConfigSync(); // Immediately syncs the configuration file void configSync();
