From bfb6f88ce3f66b7029c0be54640f0c723e56d8b8 Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Fri, 24 Aug 2018 04:48:04 +0000 Subject: Revert "Use appid between homescreen-service and apps" This reverts commit 1474d69e2682909b9d4d65006fcc9152d160346d. Bug-AGL: SPEC-1685 Change-Id: Ic145707b0ca52abe0eee08e06455965ff6477c0e Signed-off-by: Tadao Tanikawa --- app/main.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'app/main.cpp') diff --git a/app/main.cpp b/app/main.cpp index e830e38..0fb066c 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -114,8 +114,16 @@ int main(int argc, char *argv[]) hs->init(port, token.c_str()); // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){ - qDebug("Surface %s got tapShortcut\n", myname.toStdString().c_str()); - qwm->activateSurface(myname); + json_object *appnameJ = nullptr; + if(json_object_object_get_ex(object, "application_name", &appnameJ)) + { + const char *appname = json_object_get_string(appnameJ); + if(myname == appname) + { + qDebug("Surface %s got tapShortcut\n", appname); + qwm->activateSurface(myname); + } + } }); engine.load(QUrl(QStringLiteral("qrc:/Radio.qml"))); -- cgit 1.2.3-korg