Revert "Use appid between homescreen-service and apps" 99/16299/2 5.99.4 5.99.5 5.99.6 6.90.0 flounder/5.99.4 flounder/5.99.5 flounder/5.99.6 flounder_5.99.4 flounder_5.99.5 flounder_5.99.6 guppy/6.90.0 guppy_6.90.0
authorTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Fri, 24 Aug 2018 04:46:15 +0000 (04:46 +0000)
committerTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Fri, 24 Aug 2018 10:59:35 +0000 (10:59 +0000)
This reverts commit f136a3336344a6dc8b84549672acbfe19a296bb0.

Bug-AGL: SPEC-1685

Change-Id: Ie9f189fdede28d499dcf68276cd3c6be722bc87c
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
app/main.cpp

index 0bfdd52..55a7688 100644 (file)
@@ -96,8 +96,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);
+            }
+        }
     });
 #endif