aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2018-08-24 04:47:08 +0000
committerTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2018-08-24 11:20:42 +0000
commit5a708f35570b81db4f8de66763c7989874792af0 (patch)
tree86946437900c6a087063e7d06fe6c43b30cf81d7 /app
parent6495b735f39eb8b219deb5d711307869c279e3be (diff)
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>
Diffstat (limited to 'app')
-rw-r--r--app/main.cpp12
1 files changed, 10 insertions, 2 deletions
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")));