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 a90666e63c2ae13003f6e5c32324f9c6b35d0a46.

Bug-AGL: SPEC-1685

Change-Id: I4f6e02a8514ef4a20d67b0ef8c3043060d6900df
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 6f3c3c9..71868d8 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -92,8 +92,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);
+                }
+            }
         });
 
 	qmlRegisterUncreatableType<NumberType>("NumberType", 1, 0, "NumberType", "Not creatable as it is an enum type");