diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2012-01-25 16:57:11 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-01-25 20:53:08 -0500 |
| commit | 6af8eb9c7f32799ddc75e1732c50fbd23fb56994 (patch) | |
| tree | 603efca35b722a1a0d66609c813b33e91916842d /src | |
| parent | 07f729441ea1e9a6b17fff0bd2453677190b6643 (diff) | |
desktop-shell: Build in sensible defaults
This adds a default background pattern and a terminal launcher in case
we don't have a config file.
Diffstat (limited to 'src')
| -rw-r--r-- | src/shell.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/shell.c b/src/shell.c index 522a2730..cf94e8e1 100644 --- a/src/shell.c +++ b/src/shell.c @@ -110,10 +110,9 @@ struct weston_move_grab { int32_t dx, dy; }; -static int +static void shell_configuration(struct wl_shell *shell) { - int ret; char *config_file; char *path = NULL; int duration = 60; @@ -128,13 +127,11 @@ shell_configuration(struct wl_shell *shell) }; config_file = config_file_path("weston-desktop-shell.ini"); - ret = parse_config_file(config_file, cs, ARRAY_LENGTH(cs), shell); + parse_config_file(config_file, cs, ARRAY_LENGTH(cs), shell); free(config_file); shell->screensaver.path = path; shell->screensaver.duration = duration; - - return ret; } static void @@ -1447,8 +1444,7 @@ shell_init(struct weston_compositor *ec) wl_list_init(&shell->panels); wl_list_init(&shell->screensaver.surfaces); - if (shell_configuration(shell) < 0) - return -1; + shell_configuration(shell); if (wl_display_add_global(ec->wl_display, &wl_shell_interface, shell, bind_shell) == NULL) |