diff options
author | Marius Vlad <marius.vlad@collabora.com> | 2020-01-21 23:55:01 +0200 |
---|---|---|
committer | Marius Vlad <marius.vlad@collabora.com> | 2020-01-22 12:24:03 +0200 |
commit | a70783aad1f382bd2aaf8d611d070cef7266de50 (patch) | |
tree | 44a4fea6c36bef6d950fe75d6ad59664417f6b2f /homescreen/src/applicationlauncher.cpp | |
parent | a38fd717e98dfc20bd7da11dec37294afda678b5 (diff) |
homescreen/: Plug-in the launcher in the applicationlauncher
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I12d17bfb130362fbe0381884d294f03fafc8833e
Diffstat (limited to 'homescreen/src/applicationlauncher.cpp')
-rw-r--r-- | homescreen/src/applicationlauncher.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/homescreen/src/applicationlauncher.cpp b/homescreen/src/applicationlauncher.cpp index 5a1e2d6..bb9f646 100644 --- a/homescreen/src/applicationlauncher.cpp +++ b/homescreen/src/applicationlauncher.cpp @@ -18,13 +18,9 @@ #include "applicationlauncher.h" -#include "afm_user_daemon_proxy.h" - #include "hmi-debug.h" -extern org::AGL::afm::user *afm_user_daemon_proxy; - -ApplicationLauncher::ApplicationLauncher(QObject *parent) +ApplicationLauncher::ApplicationLauncher(const QString &conn_str, QObject *parent) : QObject(parent) , m_launching(false) , m_timeout(new QTimer(this)) @@ -43,6 +39,12 @@ ApplicationLauncher::ApplicationLauncher(QObject *parent) connect(this, &ApplicationLauncher::currentChanged, [&]() { setLaunching(false); }); + + m_launching = false; + m_launcher = new Launcher(conn_str, parent); + + if (m_launcher->setup_pws_connection() != 0) + HMI_DEBUG("HomeScreen","ApplicationLauncher failed to set-up connection to afm-system-daemon"); } int ApplicationLauncher::launch(const QString &application) @@ -50,7 +52,9 @@ int ApplicationLauncher::launch(const QString &application) int result = -1; HMI_DEBUG("HomeScreen","ApplicationLauncher launch %s.", application.toStdString().c_str()); - result = afm_user_daemon_proxy->start(application).value().toInt(); + if (m_launcher->connection_is_set()) + result = m_launcher->start(application); + HMI_DEBUG("HomeScreen","ApplicationLauncher pid: %d.", result); if (result > 1) { |