Revert "Use appid between homescreen-service and apps"guppy_6.90.0guppy/6.90.0flounder_5.99.6flounder_5.99.5flounder_5.99.4flounder/5.99.6flounder/5.99.5flounder/5.99.46.90.05.99.65.99.55.99.4

This reverts commit 767952ca6df6d42dc0fed3fde2d9137ec5b2a9ca.

Bug-AGL: SPEC-1685

Change-Id: Ide858dab8c5b74cb6d5a25e2c16cd383b52c47c9
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/app/main.cpp b/app/main.cpp
index ee6e830..b4c5be3 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -110,8 +110,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);
+            }
+        }
     });
 
     QFile version("/proc/version");