shell: Use the activate_app request from agl-shell-desktop
authorMarius Vlad <marius.vlad@collabora.com>
Wed, 22 Jul 2020 14:24:58 +0000 (17:24 +0300)
committerMarius Vlad <marius.vlad@collabora.com>
Thu, 23 Jul 2020 10:38:32 +0000 (13:38 +0300)
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
homescreen/src/shell.cpp

index 1427b7c..bf68f96 100644 (file)
@@ -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);
 }