Changeset View
Changeset View
Standalone View
Standalone View
ksmserver/main.cpp
Show First 20 Lines • Show All 327 Lines • ▼ Show 20 Line(s) | 327 | else if ( loginMode == QLatin1String( "restorePreviousLogout" ) ) | |||
---|---|---|---|---|---|
328 | server->restoreSession( QStringLiteral( SESSION_PREVIOUS_LOGOUT ) ); | 328 | server->restoreSession( QStringLiteral( SESSION_PREVIOUS_LOGOUT ) ); | ||
329 | else if ( loginMode == QLatin1String( "restoreSavedSession" ) ) | 329 | else if ( loginMode == QLatin1String( "restoreSavedSession" ) ) | ||
330 | server->restoreSession( QStringLiteral( SESSION_BY_USER ) ); | 330 | server->restoreSession( QStringLiteral( SESSION_BY_USER ) ); | ||
331 | else | 331 | else | ||
332 | server->startDefaultSession(); | 332 | server->startDefaultSession(); | ||
333 | 333 | | |||
334 | KDBusService service(KDBusService::Unique); | 334 | KDBusService service(KDBusService::Unique); | ||
335 | 335 | | |||
336 | server->setupShortcuts(); | | |||
337 | int ret = a->exec(); | 336 | int ret = a->exec(); | ||
338 | kde_running.release(); // needs to be done before QApplication destruction | 337 | kde_running.release(); // needs to be done before QApplication destruction | ||
339 | delete a; | 338 | delete a; | ||
340 | return ret; | 339 | return ret; | ||
341 | } | 340 | } |