From: Ray Strode <rstrode@redhat.com>
Date: Thu, 5 Dec 2013 19:58:19 +0000 (-0500)
Subject: main: drop fall back feature of load_theme
X-Git-Tag: 0.9.0~65^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09428a1b012f50b0ffdc3e683d0670e3d908fcca;p=thirdparty%2Fplymouth.git

main: drop fall back feature of load_theme

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.
---

diff --git a/src/main.c b/src/main.c
index db5d293b..0f2372f6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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);