Changeset View
Changeset View
Standalone View
Standalone View
src/service/Activities.cpp
| Show First 20 Lines • Show All 132 Lines • ▼ Show 20 Line(s) | 121 | if (activities.isEmpty()) { | |||
|---|---|---|---|---|---|
| 133 | } | 133 | } | ||
| 134 | 134 | | |||
| 135 | } else if (!atLeastOneRunning) { | 135 | } else if (!atLeastOneRunning) { | ||
| 136 | // If we have no running activities, but we have activities, | 136 | // If we have no running activities, but we have activities, | ||
| 137 | // we are in a problem. This should not happen unless the | 137 | // we are in a problem. This should not happen unless the | ||
| 138 | // configuration file is in a big problem and told us there | 138 | // configuration file is in a big problem and told us there | ||
| 139 | // are no running activities, and enlists all of them as stopped. | 139 | // are no running activities, and enlists all of them as stopped. | ||
| 140 | // In that case, we will pretend all of them are running | 140 | // In that case, we will pretend all of them are running | ||
| 141 | qWarning() << "The config file enlisted all activities as stopped"; | 141 | qCWarning(KAMD_LOG_ACTIVITIES) << "The config file enlisted all activities as stopped"; | ||
| 142 | for (const auto &keys: activities.keys()) { | 142 | for (const auto &keys: activities.keys()) { | ||
| 143 | activities[keys] = Activities::Running; | 143 | activities[keys] = Activities::Running; | ||
| 144 | } | 144 | } | ||
| 145 | } | 145 | } | ||
| 146 | } | 146 | } | ||
| 147 | 147 | | |||
| 148 | void Activities::Private::loadLastActivity() | 148 | void Activities::Private::loadLastActivity() | ||
| 149 | { | 149 | { | ||
| ▲ Show 20 Lines • Show All 281 Lines • ▼ Show 20 Line(s) | 425 | { | |||
| 431 | // Initializing D-Bus service | 431 | // Initializing D-Bus service | ||
| 432 | 432 | | |||
| 433 | new ActivitiesAdaptor(this); | 433 | new ActivitiesAdaptor(this); | ||
| 434 | KDBusConnectionPool::threadConnection().registerObject( | 434 | KDBusConnectionPool::threadConnection().registerObject( | ||
| 435 | KAMD_DBUS_OBJECT_PATH(Activities), this); | 435 | KAMD_DBUS_OBJECT_PATH(Activities), this); | ||
| 436 | 436 | | |||
| 437 | // Initializing config | 437 | // Initializing config | ||
| 438 | 438 | | |||
| 439 | qDebug() << "Config timer connecting..."; | 439 | qCDebug(KAMD_LOG_ACTIVITIES) << "Config timer connecting..."; | ||
| 440 | d->connect(&d->configSyncTimer, SIGNAL(timeout()), | 440 | d->connect(&d->configSyncTimer, SIGNAL(timeout()), | ||
| 441 | SLOT(configSync()), | 441 | SLOT(configSync()), | ||
| 442 | Qt::QueuedConnection); | 442 | Qt::QueuedConnection); | ||
| 443 | 443 | | |||
| 444 | d->configSyncTimer.setSingleShot(true); | 444 | d->configSyncTimer.setSingleShot(true); | ||
| 445 | 445 | | |||
| 446 | d->ksmserver = new KSMServer(this); | 446 | d->ksmserver = new KSMServer(this); | ||
| 447 | d->connect(d->ksmserver, SIGNAL(activitySessionStateChanged(QString, int)), | 447 | d->connect(d->ksmserver, SIGNAL(activitySessionStateChanged(QString, int)), | ||
| ▲ Show 20 Lines • Show All 152 Lines • Show Last 20 Lines | |||||