From: José Bollo <jose.bollo@iot.bzh>
Date: Tue, 9 Feb 2016 13:35:57 +0000 (+0100)
Subject: afm-launch: commits conf file
X-Git-Tag: 2.0.2~74
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-main.git;a=commitdiff_plain;h=9eeddada7a5481660ab1547dae89be3b470571e6

afm-launch: commits conf file

Change-Id: Ibf1354b444a945b22f90ca53be5b7c7eab1a688a
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---

diff --git a/conf/afm-launch.conf b/conf/afm-launch.conf
index 771569b..a572c88 100644
--- a/conf/afm-launch.conf
+++ b/conf/afm-launch.conf
@@ -15,7 +15,7 @@
 # %% %
 
 text/html
-	/usr/bin/afb-daemon --alias=/icons:%I --port=%P --rootdir=%r --token=%S --sessiondir=%D
+	/usr/bin/afb-daemon --alias=/icons:%I --port=%P --rootdir=%r --token=%S --sessiondir=%D/.afb-daemon
 	/usr/bin/web-runtime http://localhost:%P/%c?token=%S
 
 application/x-executable
diff --git a/src/afm-launch.c b/src/afm-launch.c
index c55297a..51ae4b9 100644
--- a/src/afm-launch.c
+++ b/src/afm-launch.c
@@ -35,23 +35,6 @@ extern char **environ;
 #include "afm-launch.h"
 #include "secmgr-wrap.h"
 
-/*
-%I icondir			FWK_ICON_DIR
-%P port				params->port
-%S secret			params->secret
-%D datadir			params->datadir
-%r rootdir			desc->path
-%h homedir			desc->home
-%t tag (smack label)		desc->tag
-%a appid			desc->appid
-%c content			desc->content
-%m mime-type			desc->type
-%n name				desc->name
-%p plugins			desc->plugins
-%W width			desc->width
-%H height			desc->height
-*/
-
 #define DEFAULT_TYPE "text/html"
 
 const char separators[] = " \t\n";
@@ -61,46 +44,6 @@ struct execdesc {
 	char **execs[2];
 };
 
-#if 0
-static const char *args_for_afb_daemon[] = {
-	"/usr/bin/afb-daemon",
-	"--alias=/icons:%I",
-	"--port=%P",
-	"--rootdir=%r",
-	"--token=%S",
-	NULL
-};
-
-static const char *args_for_qmlviewer[] = {
-	"/usr/bin/qt5/qmlscene",
-	"-fullscreen",
-	"-I",
-	"%r",
-	"-I",
-	"%r/imports",
-	"%r/%c",
-	NULL
-};
-
-static const char *args_for_web_runtime[] = {
-	"/usr/bin/web-runtime",
-	"http://localhost:%P/%c?token=%S",
-	NULL
-};
-
-static const char *args_for_binary[] = {
-	"%r/%c",
-	NULL
-};
-
-static struct execdesc known_launchers[] = {
-	{ "text/html",                args_for_afb_daemon, args_for_web_runtime },
-	{ "application/x-executable", args_for_binary,     NULL },
-	{ "text/vnd.qt.qml",          args_for_qmlviewer,  NULL },
-	{ NULL, NULL, NULL }
-};
-#endif
-
 struct launchers {
 	int count;
 	struct execdesc *descs;
@@ -272,6 +215,24 @@ static int read_configuration_file(const char *filepath)
 	return rc;
 }
 
+/*
+%I icondir			FWK_ICON_DIR
+%P port				params->port
+%S secret			params->secret
+%D datadir			params->datadir
+%r rootdir			desc->path
+%h homedir			desc->home
+%t tag (smack label)		desc->tag
+%a appid			desc->appid
+%c content			desc->content
+%m mime-type			desc->type
+%n name				desc->name
+%p plugins			desc->plugins
+%W width			desc->width
+%H height			desc->height
+%% %
+*/
+
 static char **instantiate_arguments(const char **args, struct afm_launch_desc *desc, struct launchparam *params)
 {
 	const char **iter, *p, *v;