From: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Date: Fri, 24 Aug 2018 04:47:08 +0000 (+0000)
Subject: Revert "Use appid between homescreen-service and apps"
X-Git-Tag: 5.99.4~1
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=5a708f35570b81db4f8de66763c7989874792af0;p=apps%2Fmixer.git

Revert "Use appid between homescreen-service and apps"

This reverts commit 6495b735f39eb8b219deb5d711307869c279e3be.

Bug-AGL: SPEC-1685

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

diff --git a/app/main.cpp b/app/main.cpp
index 844913f..b8ef25a 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -98,8 +98,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
 		engine.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));