Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "afm-user-daemon: Remove it by default"
[src/app-framework-main.git]
/
src
/
wgtpkg-install.c
diff --git
a/src/wgtpkg-install.c
b/src/wgtpkg-install.c
index
c5c41ea
..
bbeb2fe
100644
(file)
--- a/
src/wgtpkg-install.c
+++ b/
src/wgtpkg-install.c
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2015-201
8
IoT.bzh
+ Copyright (C) 2015-201
9
IoT.bzh
author: José Bollo <jose.bollo@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) {
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);
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) {
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")) {
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];
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);
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;
if (install_file_properties(desc))
goto error4;
- port = get_port();
- if (port < 0)
- goto error4;
-
uconf.installdir = installdir;
uconf.icondir = FWK_ICON_DIR;
uconf.installdir = installdir;
uconf.icondir = FWK_ICON_DIR;
- uconf.port = port;
+ uconf.port =
get_
port;
if (unit_install(ifo, &uconf))
goto error4;
if (unit_install(ifo, &uconf))
goto error4;