From: Ray Strode <rstrode@redhat.com>
Date: Wed, 27 Aug 2008 20:01:28 +0000 (-0400)
Subject: respond w/ "" if user hits esc to password prompt
X-Git-Tag: 0.6.0~170
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e962a0bbd96bbec72f934a0f8053bd5c26dc21f4;p=thirdparty%2Fplymouth.git

respond w/ "" if user hits esc to password prompt

This is so when we load the next plugin it won't
get confused.
---

diff --git a/src/plugins/splash/details/plugin.c b/src/plugins/splash/details/plugin.c
index 50e13abe..3706e81f 100644
--- a/src/plugins/splash/details/plugin.c
+++ b/src/plugins/splash/details/plugin.c
@@ -205,6 +205,12 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 
   ply_trace ("hiding splash screen");
 
+  if (plugin->pending_password_answer != NULL)
+    {
+      ply_answer_with_string (plugin->pending_password_answer, "");
+      plugin->pending_password_answer = NULL;
+    }
+
   ply_window_set_keyboard_input_handler (window, NULL, NULL);
   ply_window_set_backspace_handler (window, NULL, NULL);
   ply_window_set_enter_handler (window, NULL, NULL);
diff --git a/src/plugins/splash/fade-in/plugin.c b/src/plugins/splash/fade-in/plugin.c
index 2641217e..604c1814 100644
--- a/src/plugins/splash/fade-in/plugin.c
+++ b/src/plugins/splash/fade-in/plugin.c
@@ -578,6 +578,12 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 {
   assert (plugin != NULL);
 
+  if (plugin->pending_password_answer != NULL)
+    {
+      ply_answer_with_string (plugin->pending_password_answer, "");
+      plugin->pending_password_answer = NULL;
+    }
+
   ply_window_set_keyboard_input_handler (window, NULL, NULL);
   ply_window_set_backspace_handler (window, NULL, NULL);
   ply_window_set_enter_handler (window, NULL, NULL);
diff --git a/src/plugins/splash/spinfinity/plugin.c b/src/plugins/splash/spinfinity/plugin.c
index 44d66cf3..cd9a85b0 100644
--- a/src/plugins/splash/spinfinity/plugin.c
+++ b/src/plugins/splash/spinfinity/plugin.c
@@ -387,6 +387,12 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 {
   assert (plugin != NULL);
 
+  if (plugin->pending_password_answer != NULL)
+    {
+      ply_answer_with_string (plugin->pending_password_answer, "");
+      plugin->pending_password_answer = NULL;
+    }
+
   ply_window_set_keyboard_input_handler (window, NULL, NULL);
   ply_window_set_backspace_handler (window, NULL, NULL);
   ply_window_set_enter_handler (window, NULL, NULL);
diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
index 11c2dc4d..465d7634 100644
--- a/src/plugins/splash/text/plugin.c
+++ b/src/plugins/splash/text/plugin.c
@@ -253,6 +253,12 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 
   ply_trace ("hiding splash screen");
 
+  if (plugin->pending_password_answer != NULL)
+    {
+      ply_answer_with_string (plugin->pending_password_answer, "");
+      plugin->pending_password_answer = NULL;
+    }
+
   ply_window_set_keyboard_input_handler (window, NULL, NULL);
   ply_window_set_backspace_handler (window, NULL, NULL);
   ply_window_set_enter_handler (window, NULL, NULL);