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
meson.build: Increase the build version of agl-compositor
[src/agl-compositor.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
8c4b10b
..
2b12a7b
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-24,6
+24,7
@@
*/
#include "ivi-compositor.h"
*/
#include "ivi-compositor.h"
+#include "policy.h"
#include <assert.h>
#include <errno.h>
#include <assert.h>
#include <errno.h>
@@
-47,6
+48,7
@@
#include <libweston/weston-log.h>
#include "shared/os-compatibility.h"
#include <libweston/weston-log.h>
#include "shared/os-compatibility.h"
+#include "shared/helpers.h"
#include "agl-shell-server-protocol.h"
#include "agl-shell-server-protocol.h"
@@
-1227,6
+1229,9
@@
int main(int argc, char *argv[])
if (ivi_desktop_init(&ivi) < 0)
goto error_compositor;
if (ivi_desktop_init(&ivi) < 0)
goto error_compositor;
+ if (ivi_policy_init(&ivi) < 0)
+ goto error_compositor;
+
if (ivi_shell_init(&ivi) < 0)
goto error_compositor;
if (ivi_shell_init(&ivi) < 0)
goto error_compositor;
@@
-1262,6
+1267,8
@@
error_compositor:
weston_log_subscriber_destroy_log(logger);
weston_log_subscriber_destroy_log(logger);
+ ivi_policy_destroy(ivi.policy);
+
error_signals:
for (size_t i = 0; i < ARRAY_LENGTH(signals); ++i)
if (signals[i])
error_signals:
for (size_t i = 0; i < ARRAY_LENGTH(signals); ++i)
if (signals[i])