From 1f6f7ca19664046bbbdf726d58fc1a6e1c623b63 Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Fri, 24 Aug 2018 04:46:40 +0000 Subject: Revert "Use appid between homescreen-service and apps" This reverts commit 47dfb73f5b84fe5baa7db557b57c274eed298081. Bug-AGL: SPEC-1685 Change-Id: Ia15f8650fd7a67726d5a7d519b1744694c796c2b Signed-off-by: Tadao Tanikawa --- app/main.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/main.cpp b/app/main.cpp index a1cd02e..3f38cc0 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -87,8 +87,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); + } + } }); context->setContextProperty("mediaplayer", new Mediaplayer(bindingAddress, context)); -- cgit 1.2.3-korg