From 1474d69e2682909b9d4d65006fcc9152d160346d Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Mon, 6 Aug 2018 13:38:43 +0900 Subject: Use appid between homescreen-service and apps Use appid between hss and apps, and check event destination in libhomescreen. So these is no need compare code when recived Event_TapShortcut Event. BUG-AGL: SPEC-1645 Change-Id: I325f51f7189aadf89acb2125f6c4886211536dfb Signed-off-by: zheng_wenlong --- app/main.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'app/main.cpp') diff --git a/app/main.cpp b/app/main.cpp index 0fb066c..e830e38 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -114,16 +114,8 @@ 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){ - 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); - } - } + qDebug("Surface %s got tapShortcut\n", myname.toStdString().c_str()); + qwm->activateSurface(myname); }); engine.load(QUrl(QStringLiteral("qrc:/Radio.qml"))); -- cgit 1.2.3-korg