Changeset View
Changeset View
Standalone View
Standalone View
src/kdeinit/ktoolinvocation_x11.cpp
| Show First 20 Lines • Show All 243 Lines • ▼ Show 20 Line(s) | 124 | { | |||
|---|---|---|---|---|---|
| 244 | // with sending more ASN data | 244 | // with sending more ASN data | ||
| 245 | if (kdeinitExec(cmd, cmdTokens, &error, nullptr, startup_id)) { | 245 | if (kdeinitExec(cmd, cmdTokens, &error, nullptr, startup_id)) { | ||
| 246 | KMessage::message(KMessage::Error, | 246 | KMessage::message(KMessage::Error, | ||
| 247 | i18n("Could not launch the mail client:\n\n%1", error), | 247 | i18n("Could not launch the mail client:\n\n%1", error), | ||
| 248 | i18n("Could not launch Mail Client")); | 248 | i18n("Could not launch Mail Client")); | ||
| 249 | } | 249 | } | ||
| 250 | } | 250 | } | ||
| 251 | 251 | | |||
| 252 | #if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0) | ||||
| 252 | void KToolInvocation::invokeBrowser(const QString &url, const QByteArray &startup_id) | 253 | void KToolInvocation::invokeBrowser(const QString &url, const QByteArray &startup_id) | ||
| 253 | { | 254 | { | ||
| 254 | if (!isMainThreadActive()) { | 255 | if (!isMainThreadActive()) { | ||
| 255 | return; | 256 | return; | ||
| 256 | } | 257 | } | ||
| 257 | 258 | | |||
| 258 | QStringList args; | 259 | QStringList args; | ||
| 259 | args << url; | 260 | args << url; | ||
| ▲ Show 20 Lines • Show All 77 Lines • ▼ Show 20 Line(s) | |||||
| 337 | //qDebug() << "Using" << exe << "to open" << url; | 338 | //qDebug() << "Using" << exe << "to open" << url; | ||
| 338 | if (kdeinitExec(exe, args, &error, nullptr, startup_id)) { | 339 | if (kdeinitExec(exe, args, &error, nullptr, startup_id)) { | ||
| 339 | KMessage::message(KMessage::Error, | 340 | KMessage::message(KMessage::Error, | ||
| 340 | // TODO: i18n("Could not launch %1:\n\n%2", exe, error), | 341 | // TODO: i18n("Could not launch %1:\n\n%2", exe, error), | ||
| 341 | i18n("Could not launch the browser:\n\n%1", error), | 342 | i18n("Could not launch the browser:\n\n%1", error), | ||
| 342 | i18n("Could not launch Browser")); | 343 | i18n("Could not launch Browser")); | ||
| 343 | } | 344 | } | ||
| 344 | } | 345 | } | ||
| 346 | #endif | ||||
| 345 | 347 | | |||
| 346 | void KToolInvocation::invokeTerminal(const QString &command, | 348 | void KToolInvocation::invokeTerminal(const QString &command, | ||
| 347 | const QString &workdir, | 349 | const QString &workdir, | ||
| 348 | const QByteArray &startup_id) | 350 | const QByteArray &startup_id) | ||
| 349 | { | 351 | { | ||
| 350 | if (!isMainThreadActive()) { | 352 | if (!isMainThreadActive()) { | ||
| 351 | return; | 353 | return; | ||
| 352 | } | 354 | } | ||
| Show All 32 Lines | |||||