X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-install.c;h=bbeb2fe41e1fe4e283979b04ac3feda9551dbfc5;hb=7553044c59814c33763bb4b1c34664dceed68735;hp=c5c41ea54c69f89d8528180de088d5f01f4c6014;hpb=1b1399ed154f68d90665db122073c18d60b2c685;p=src%2Fapp-framework-main.git

diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c
index c5c41ea..bbeb2fe 100644
--- a/src/wgtpkg-install.c
+++ b/src/wgtpkg-install.c
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2015-2018 IoT.bzh
+ Copyright (C) 2015-2019 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -300,7 +300,7 @@ static int for_all_content(const struct wgt_desc *desc, int (*action)(const char
 	rc = action(desc->content_src, desc->content_type);
 	feat = desc->features;
 	while (feat) {
-		if (!strcmp(feat->name, "urn:AGL:widget:provided-unit")) {
+		if (!strcmp(feat->name, FWK_PREFIX"widget:provided-unit")) {
 			src = wgt_info_param(feat, "content.src");
 			type = wgt_info_param(feat, "content.type");
 			rc2 = action(src, type);
@@ -447,7 +447,7 @@ static int install_file_properties(const struct wgt_desc *desc)
 	rc = 0;
 	feat = desc->features;
 	while (feat) {
-		if (!strcmp(feat->name, "urn:AGL:widget:file-properties")) {
+		if (!strcmp(feat->name, FWK_PREFIX"widget:file-properties")) {
 			param = feat->params;
 			while (param) {
 				if (!strcmp(param->value, "executable")) {
@@ -541,7 +541,7 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force
 	struct wgt_info *ifo;
 	const struct wgt_desc *desc;
 	char installdir[PATH_MAX];
-	int port, err;
+	int err;
 	struct unitconf uconf;
 
 	NOTICE("-- INSTALLING widget %s to %s --", wgtfile, root);
@@ -596,13 +596,9 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force
 	if (install_file_properties(desc))
 		goto error4;
 
-	port = get_port();
-	if (port < 0)
-		goto error4;
-
 	uconf.installdir = installdir;
 	uconf.icondir = FWK_ICON_DIR;
-	uconf.port = port;
+	uconf.port = get_port;
 	if (unit_install(ifo, &uconf))
 		goto error4;