From: Scott James Remnant <scott@ubuntu.com>
Date: Thu, 18 Mar 2010 20:38:13 +0000 (+0000)
Subject: [main] add deactivate_splash() function
X-Git-Tag: 0.8.0~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dfe559d06003a53c46b3764d928d68e1b300072;p=thirdparty%2Fplymouth.git

[main] add deactivate_splash() function

To make it easier to alter the deactivate path, split into its own
function.
---

diff --git a/src/main.c b/src/main.c
index 383cf4ab..a7ad894e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -33,6 +33,7 @@
 #include <unistd.h>
 #include <wchar.h>
 #include <paths.h>
+#include <assert.h>
 
 #include <linux/kd.h>
 #include <linux/vt.h>
@@ -720,6 +721,25 @@ quit_program (state_t *state)
     }
 }
 
+static void
+deactivate_splash (state_t *state)
+{
+  assert (!state->is_inactive);
+
+  if (state->renderer != NULL)
+    {
+      ply_trace ("deactivating renderer");
+      ply_renderer_deactivate (state->renderer);
+    }
+
+  ply_trace ("quitting splash");
+  quit_splash (state);
+
+  ply_trigger_pull (state->deactivate_trigger, NULL);
+  state->deactivate_trigger = NULL;
+  state->is_inactive = true;
+}
+
 static void
 on_boot_splash_idle (state_t *state)
 {
@@ -744,18 +764,8 @@ on_boot_splash_idle (state_t *state)
     }
   else if (state->deactivate_trigger != NULL)
     {
-      if (state->renderer != NULL)
-        {
-          ply_trace ("deactivating renderer");
-          ply_renderer_deactivate (state->renderer);
-        }
-
-      ply_trace ("quitting splash");
-      quit_splash (state);
-
-      ply_trigger_pull (state->deactivate_trigger, NULL);
-      state->deactivate_trigger = NULL;
-      state->is_inactive = true;
+      ply_trace ("deactivating splash");
+      deactivate_splash (state);
     }
 }