diff --git a/kdecore/util/klauncher_iface.h b/kdecore/util/klauncher_iface.h index 4b4f8d45..5060f35e 100644 --- a/kdecore/util/klauncher_iface.h +++ b/kdecore/util/klauncher_iface.h @@ -61,13 +61,6 @@ public Q_SLOTS: // METHODS return callWithArgumentList(QDBus::Block, QLatin1String("autoStart"), argumentList); } - inline QDBusReply exec_blind(const QString &name, const QStringList &arg_list, const QStringList &envs, const QString &startup_id) - { - QList argumentList; - argumentList << qVariantFromValue(name) << qVariantFromValue(arg_list) << qVariantFromValue(envs) << qVariantFromValue(startup_id); - return callWithArgumentList(QDBus::Block, QLatin1String("exec_blind"), argumentList); - } - inline QDBusReply exec_blind(const QString &name, const QStringList &arg_list) { QList argumentList; diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp index 6908c392..3ea4a80c 100644 --- a/kinit/klauncher.cpp +++ b/kinit/klauncher.cpp @@ -667,7 +667,7 @@ KLauncher::requestStart(KLaunchRequest *request) while (lastRequest != 0); } -void KLauncher::exec_blind(const QString &name, const QStringList &arg_list, const QStringList &envs, const QString &startup_id) +void KLauncher::exec_blind(const QString &name, const QStringList &arg_list) { KLaunchRequest *request = new KLaunchRequest; request->autoStart = false; @@ -676,13 +676,7 @@ void KLauncher::exec_blind(const QString &name, const QStringList &arg_list, con request->dbus_startup_type = KService::DBusNone; request->pid = 0; request->status = KLaunchRequest::Launching; - request->envs = envs; - // Find service, if any - strip path if needed - KService::Ptr service = KService::serviceByDesktopName( name.mid( name.lastIndexOf(QLatin1Char('/')) + 1 )); - if (service) - send_service_startup_info(request, service, startup_id.toLocal8Bit(), QStringList()); - else // no .desktop file, no startup info - cancel_service_startup_info( request, startup_id.toLocal8Bit(), envs ); + request->envs = QStringList(); requestStart(request); // We don't care about this request any longer.... diff --git a/kinit/klauncher.h b/kinit/klauncher.h index fe8b555a..270ce2bf 100644 --- a/kinit/klauncher.h +++ b/kinit/klauncher.h @@ -152,14 +152,8 @@ public: // remote methods, called by KLauncherAdaptor /** * Starts a program. - * 'envs' are environment variables that will be added - * to this program's environment before starting it - * 'startup_id' is for application startup notification, - * "" is the default, "0" for none */ - void exec_blind(const QString &name, const QStringList &arg_list, const QStringList &envs, const QString &startup_id); - inline void exec_blind(const QString &name, const QStringList &arg_list) - { exec_blind(name, arg_list, QStringList(), QLatin1String("0")); } + void exec_blind(const QString &name, const QStringList &arg_list); bool kdeinit_exec(const QString &app, const QStringList &args, const QString& workdir, const QStringList &envs, diff --git a/kinit/klauncher_adaptor.cpp b/kinit/klauncher_adaptor.cpp index c3e7d306..9517d8eb 100644 --- a/kinit/klauncher_adaptor.cpp +++ b/kinit/klauncher_adaptor.cpp @@ -54,12 +54,6 @@ void KLauncherAdaptor::exec_blind(const QString &name, const QStringList &arg_li static_cast(parent())->exec_blind(name, arg_list); } -void KLauncherAdaptor::exec_blind(const QString &name, const QStringList &arg_list, const QStringList &envs, const QString &startup_id) -{ - // handle method call org.kde.KLauncher.exec_blind - static_cast(parent())->exec_blind(name, arg_list, envs, startup_id); -} - int KLauncherAdaptor::kdeinit_exec(const QString &app, const QStringList &args, const QStringList &env, const QString& startup_id, const QDBusMessage &msg, QString &, QString &, qint64 &) { // handle method call org.kde.KLauncher.kdeinit_exec diff --git a/kinit/klauncher_adaptor.h b/kinit/klauncher_adaptor.h index 7ab92031..3c476166 100644 --- a/kinit/klauncher_adaptor.h +++ b/kinit/klauncher_adaptor.h @@ -47,7 +47,6 @@ public: // PROPERTIES public Q_SLOTS: // METHODS void autoStart(int phase = 1); void exec_blind(const QString &name, const QStringList &arg_list); - void exec_blind(const QString &name, const QStringList &arg_list, const QStringList &envs, const QString &startup_id); int kdeinit_exec(const QString &app, const QStringList &args, const QStringList &env, const QString& startup_id, const QDBusMessage &msg, QString &dbusServiceName, QString &error, qint64 &pid); int kdeinit_exec_wait(const QString &app, const QStringList &args, const QStringList &env, const QString& startup_id, const QDBusMessage &msg, QString &dbusServiceName, QString &error, qint64 &pid); int kdeinit_exec_with_workdir(const QString &app, const QStringList &args, const QString& workdir, const QStringList &env, const QString& startup_id, const QDBusMessage &msg, QString &dbusServiceName, QString &error, qint64 &pid);