From: Marius Vlad <marius.vlad@collabora.com>
Date: Wed, 22 Jul 2020 14:24:58 +0000 (+0300)
Subject: shell: Use the activate_app request from agl-shell-desktop
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=051312fd213d62c154b781ee037b1aab50e005d2;p=apps%2Fhomescreen.git

shell: Use the activate_app request from agl-shell-desktop

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
---

diff --git a/homescreen/src/shell.cpp b/homescreen/src/shell.cpp
index 1427b7c..bf68f96 100644
--- a/homescreen/src/shell.cpp
+++ b/homescreen/src/shell.cpp
@@ -36,16 +36,16 @@ getWlOutput(QPlatformNativeInterface *native, QScreen *screen)
 	return static_cast<struct ::wl_output*>(output);
 }
 
-void Shell::activate_app(QWindow *win, const QString &app_id)
+void
+Shell::activate_app(QWindow *win, const QString &app_id)
 {
-    QPlatformNativeInterface *native = qApp->platformNativeInterface();
-    QScreen *screen = win->screen();
+	QPlatformNativeInterface *native = qApp->platformNativeInterface();
+	QScreen *screen = win->screen();
 
-    struct wl_output *output = getWlOutput(native, screen);
+	struct wl_output *output = getWlOutput(native, screen);
 
-    qDebug() << "++ activating app_id " << app_id.toStdString().c_str();
+	qDebug() << "++ activating app_id " << app_id.toStdString().c_str();
 
-    agl_shell_activate_app(this->shell.get(),
-                           app_id.toStdString().c_str(),
-                           output);
+	agl_shell_desktop_activate_app(this->shell_desktop.get(),
+			app_id.toStdString().c_str(), NULL, output);
 }