Changeset View
Changeset View
Standalone View
Standalone View
ksmserver/main.cpp
Show First 20 Lines • Show All 279 Lines • ▼ Show 20 Line(s) | 231 | { | |||
---|---|---|---|---|---|
280 | parser.addOption(lockscreenOption); | 280 | parser.addOption(lockscreenOption); | ||
281 | 281 | | |||
282 | QCommandLineOption noLockscreenOption(QStringLiteral("no-lockscreen"), | 282 | QCommandLineOption noLockscreenOption(QStringLiteral("no-lockscreen"), | ||
283 | i18n("Starts without lock screen support. Only needed if other component provides the lock screen.")); | 283 | i18n("Starts without lock screen support. Only needed if other component provides the lock screen.")); | ||
284 | parser.addOption(noLockscreenOption); | 284 | parser.addOption(noLockscreenOption); | ||
285 | 285 | | |||
286 | parser.process(*a); | 286 | parser.process(*a); | ||
287 | 287 | | |||
288 | //TODO: should we still use this? | | |||
289 | // if( !QDBusConnection::sessionBus().interface()-> | | |||
290 | // registerService( QStringLiteral( "org.kde.ksmserver" ), | | |||
291 | // QDBusConnectionInterface::DontQueueService ) ) | | |||
292 | // { | | |||
293 | // qCWarning(KSMSERVER, "Could not register with D-BUS. Aborting."); | | |||
294 | // return 1; | | |||
295 | // } | | |||
296 | | ||||
297 | QString wm = parser.value(wmOption); | 288 | QString wm = parser.value(wmOption); | ||
298 | 289 | | |||
299 | bool only_local = !parser.isSet(nolocalOption); | 290 | bool only_local = !parser.isSet(nolocalOption); | ||
300 | #ifndef HAVE__ICETRANSNOLISTEN | 291 | #ifndef HAVE__ICETRANSNOLISTEN | ||
301 | /* this seems strange, but the default is only_local, so if !only_local | 292 | /* this seems strange, but the default is only_local, so if !only_local | ||
302 | * the option --nolocal was given, and we warn (the option --nolocal | 293 | * the option --nolocal was given, and we warn (the option --nolocal | ||
303 | * does nothing on this platform, as here the default is reversed) | 294 | * does nothing on this platform, as here the default is reversed) | ||
304 | */ | 295 | */ | ||
▲ Show 20 Lines • Show All 51 Lines • Show Last 20 Lines |