diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2013-05-26 21:48:14 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-05-26 21:48:14 -0400 |
| commit | 14e438c8a2bc7342489d248a3d66b9123245d552 (patch) | |
| tree | fe1d3774c4e00f9030f6a78481d1a49472178bea /src/shell.c | |
| parent | 115b0f729c99d6b9f7ffa004209249094fe871f0 (diff) | |
| download | weston-14e438c8a2bc7342489d248a3d66b9123245d552.tar.gz weston-14e438c8a2bc7342489d248a3d66b9123245d552.tar.bz2 weston-14e438c8a2bc7342489d248a3d66b9123245d552.zip | |
compositor: Parse config file in main(), only keep weston config object
Now that all backends and modules have been converted to the new
config parser API, we don't have to keep the fd around.
Diffstat (limited to 'src/shell.c')
| -rw-r--r-- | src/shell.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shell.c b/src/shell.c index 0e18db22..14433288 100644 --- a/src/shell.c +++ b/src/shell.c @@ -379,7 +379,7 @@ get_animation_type(char *animation) } static void -shell_configuration(struct desktop_shell *shell, int config_fd) +shell_configuration(struct desktop_shell *shell) { struct weston_config_section *section; int duration; @@ -4418,7 +4418,7 @@ module_init(struct weston_compositor *ec, wl_array_init(&shell->workspaces.array); wl_list_init(&shell->workspaces.client_list); - shell_configuration(shell, ec->config_fd); + shell_configuration(shell); for (i = 0; i < shell->workspaces.num; i++) { pws = wl_array_add(&shell->workspaces.array, sizeof *pws); |