Code Review
/
src
/
agl-compositor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
layout: Give ini config precedence over agl_shell
[src/agl-compositor.git]
/
src
/
layout.c
diff --git
a/src/layout.c
b/src/layout.c
index
8c8b4be
..
082c36e
100644
(file)
--- a/
src/layout.c
+++ b/
src/layout.c
@@
-170,6
+170,12
@@
ivi_layout_init(struct ivi_compositor *ivi, struct ivi_output *output)
if (parse_activation_area(t, output) < 0)
weston_log("Invalid activation-area \"%s\" for output %s\n",
t, output->name);
if (parse_activation_area(t, output) < 0)
weston_log("Invalid activation-area \"%s\" for output %s\n",
t, output->name);
+ } else {
+ weston_log("WARNING: activation-area detected in ini file, "
+ "but agl_shell override detected!\n");
+ if (parse_activation_area(t, output) < 0)
+ weston_log("Invalid activation-area \"%s\" for output %s\n",
+ t, output->name);
}
}
free(t);
}
}
free(t);