fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 07:18:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

main: drop fall back feature of load_theme

Browse source 
load_theme currently takes a boolean that if true, will
make it load the built-in "details" plugin if the main plugin
fails to load.

Boolean arguments are hard to read, so this commit drops it.
This commit is contained in:
Ray Strode 2013-12-05 14:58:19 -05:00
parent 731db96ca3
commit 09428a1b01
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main.c
View file

@ -127,8 +127,7 @@ typedef struct
static ply_boot_splash_t *load_built_in_theme (state_t *state);
static ply_boot_splash_t *load_theme (state_t *state,
const char *theme_path,
bool fall_back_if_neccessary);
const char *theme_path);
static void show_theme (state_t *state,
ply_boot_splash_t *splash);
static ply_boot_splash_t *start_boot_splash (state_t *state,
@ -1708,8 +1707,7 @@ load_built_in_theme (state_t *state)
static ply_boot_splash_t *
load_theme (state_t *state,
const char *theme_path,
bool fall_back_if_neccessary)
const char *theme_path)
{
ply_boot_splash_t *splash;
bool is_loaded;
@ -1722,13 +1720,6 @@ load_theme (state_t *state,
state->boot_buffer);
is_loaded = ply_boot_splash_load (splash);
if (!is_loaded && fall_back_if_neccessary)
{
ply_trace ("Splash couldn't be loaded: %m");
ply_trace ("Loading built in splash");
is_loaded = ply_boot_splash_load_built_in (splash);
}
if (!is_loaded)
{
@ -1786,7 +1777,14 @@ start_boot_splash (state_t *state,
{
ply_boot_splash_t *splash;
splash = load_theme (state, theme_path, fall_back_if_necessary);
splash = load_theme (state, theme_path);
if (splash == NULL && fall_back_if_neccessary)
splash = load_built_in_theme (state);
if (splash == NULL)
return NULL;
add_displays_and_keyboard_to_boot_splash (state, splash);
show_theme (state, splash);