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: Remove explicit damage call
[src/agl-compositor.git]
/
src
/
compositor.c
diff --git
a/src/compositor.c
b/src/compositor.c
index
22c4979
..
c8f9e60
100644
(file)
--- a/
src/compositor.c
+++ b/
src/compositor.c
@@
-1177,6
+1177,14
@@
load_modules(struct ivi_compositor *ivi, const char *modules,
continue;
}
continue;
}
+ if (strstr(buffer, "systemd-notify.so")) {
+ weston_log("systemd-notify plug-in already loaded!\n");
+ p = end;
+ while (*p == ',')
+ p++;
+ continue;
+ }
+
module_init = weston_load_module(buffer, "wet_module_init");
if (!module_init)
return -1;
module_init = weston_load_module(buffer, "wet_module_init");
if (!module_init)
return -1;
@@
-1240,7
+1248,7
@@
compositor_init_config(struct weston_compositor *compositor,
&compositor->kb_repeat_delay, 400);
weston_config_section_get_bool(section, "vt-switching",
&compositor->kb_repeat_delay, 400);
weston_config_section_get_bool(section, "vt-switching",
- &vt_switching,
tru
e);
+ &vt_switching,
fals
e);
compositor->vt_switching = vt_switching;
/* agl-compositor.ini [core] */
compositor->vt_switching = vt_switching;
/* agl-compositor.ini [core] */