From: Scott James Remnant <scott@ubuntu.com>
Date: Thu, 18 Mar 2010 20:58:57 +0000 (+0000)
Subject: [fade-throbber] resume animations on display_normal
X-Git-Tag: 0.8.0~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b4a60cc5c53ee4c9ec87e242d56b37b33d18c09;p=thirdparty%2Fplymouth.git

[fade-throbber] resume animations on display_normal

Change the display_normal() function so that rather than being a no-op
if we already saved the state as normal, it restarts any animations and
redraws the views.

The only thing we now do if the state is not previously the same is
hide any prompt.

This allows this to be used to reanimate the plugin on reactivate.
---

diff --git a/src/plugins/splash/fade-throbber/plugin.c b/src/plugins/splash/fade-throbber/plugin.c
index 2e3221ef..639fce8c 100644
--- a/src/plugins/splash/fade-throbber/plugin.c
+++ b/src/plugins/splash/fade-throbber/plugin.c
@@ -1038,14 +1038,12 @@ static void
 display_normal (ply_boot_splash_plugin_t *plugin)
 {
   pause_views (plugin);
-  if (plugin->state ==  PLY_BOOT_SPLASH_DISPLAY_QUESTION_ENTRY ||
-      plugin->state ==  PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY)
-    {
-      plugin->state = PLY_BOOT_SPLASH_DISPLAY_NORMAL;
-      hide_prompt (plugin);
-      start_animation (plugin);
-      redraw_views (plugin);
-    }
+  if (plugin->state != PLY_BOOT_SPLASH_DISPLAY_NORMAL)
+    hide_prompt (plugin);
+
+  plugin->state = PLY_BOOT_SPLASH_DISPLAY_NORMAL;
+  start_animation (plugin);
+  redraw_views (plugin);
   unpause_views (plugin);
 }