Code Review
/
staging
/
HomeScreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
various changes in user language settings
[staging/HomeScreen.git]
/
HomeScreenAppFrameworkBinderAGL
/
src
/
homescreenappframeworkbinderagl.cpp
diff --git
a/HomeScreenAppFrameworkBinderAGL/src/homescreenappframeworkbinderagl.cpp
b/HomeScreenAppFrameworkBinderAGL/src/homescreenappframeworkbinderagl.cpp
index
91df6f7
..
7f9cc51
100644
(file)
--- a/
HomeScreenAppFrameworkBinderAGL/src/homescreenappframeworkbinderagl.cpp
+++ b/
HomeScreenAppFrameworkBinderAGL/src/homescreenappframeworkbinderagl.cpp
@@
-39,7
+39,7
@@
HomeScreenAppFrameworkBinderAgl::HomeScreenAppFrameworkBinderAgl(QObject *parent
QDBusConnection::sessionBus(),
0);
QDBusConnection::sessionBus(),
0);
-#ifdef
__arm__
+#ifdef
HAVE_IVI_LAYERMANAGEMENT_API
QString runnables = mp_dBusAfmUserProxy->runnables("{\"dummy\": \"entry\"}");
qDebug("runnables: %s", runnables.toStdString().c_str());
QString runnables = mp_dBusAfmUserProxy->runnables("{\"dummy\": \"entry\"}");
qDebug("runnables: %s", runnables.toStdString().c_str());
@@
-51,12
+51,11
@@
HomeScreenAppFrameworkBinderAgl::HomeScreenAppFrameworkBinderAgl(QObject *parent
QJsonObject appObject = appsArray[i].toObject();
AppInfo appInfo;
appInfo.read(appObject);
QJsonObject appObject = appsArray[i].toObject();
AppInfo appInfo;
appInfo.read(appObject);
- qDebug("name %s", appInfo.name.toStdString().c_str());
+ qDebug("name %s", appInfo.name
()
.toStdString().c_str());
m_apps.append(appInfo);
}
m_apps.append(appInfo);
}
-#endif
-#ifdef __i386__
+#else
// for the simulation
/*AppInfo ai;
ai.setName("org.test.app1");
// for the simulation
/*AppInfo ai;
ai.setName("org.test.app1");
@@
-82,15
+81,11
@@
QList<AppInfo> HomeScreenAppFrameworkBinderAgl::getAvailableApps()
int HomeScreenAppFrameworkBinderAgl::launchApp(const QString &name)
{
int pid = -1;
int HomeScreenAppFrameworkBinderAgl::launchApp(const QString &name)
{
int pid = -1;
-#ifdef
__arm__
+#ifdef
HAVE_IVI_LAYERMANAGEMENT_API
qDebug("launchApp name: %s", name.toStdString().c_str());
QString jsonLaunch = "{\"id\":\"" + name + "\", \"mode\":\"local\"}";
qDebug("jsonLaunch %s", jsonLaunch.toStdString().c_str());
qDebug("launchApp name: %s", name.toStdString().c_str());
QString jsonLaunch = "{\"id\":\"" + name + "\", \"mode\":\"local\"}";
qDebug("jsonLaunch %s", jsonLaunch.toStdString().c_str());
- QString runIdString = mp_dBusAfmUserProxy->start(jsonLaunch);
- qDebug("runIdString %s", runIdString.toStdString().c_str());
- int runid = runIdString.toInt();
-
- QString stateString = mp_dBusAfmUserProxy->state(runIdString);
+ QString stateString = mp_dBusAfmUserProxy->once(jsonLaunch);
qDebug("stateString %s", stateString.toStdString().c_str());
QJsonDocument jsonResponse = QJsonDocument::fromJson(stateString.toUtf8());
qDebug("stateString %s", stateString.toStdString().c_str());
QJsonDocument jsonResponse = QJsonDocument::fromJson(stateString.toUtf8());
@@
-110,8
+105,7
@@
int HomeScreenAppFrameworkBinderAgl::launchApp(const QString &name)
}
qDebug("launchApp pid: %d", pid);
}
qDebug("launchApp pid: %d", pid);
-#endif
-#ifdef __i386__
+#else
qDebug("launchApp name: %s", name.toStdString().c_str());
pid = qrand();
#endif
qDebug("launchApp name: %s", name.toStdString().c_str());
pid = qrand();
#endif