|
|
19741aa |
From 7a87b2210b2baa2c43276062e5a24b9b3e5760e6 Mon Sep 17 00:00:00 2001
|
|
|
19741aa |
From: Ray Strode <rstrode@redhat.com>
|
|
|
19741aa |
Date: Mon, 5 Oct 2009 17:37:48 -0400
|
|
|
19741aa |
Subject: [PATCH] [text] Don't crash after password prompt
|
|
|
19741aa |
|
|
|
19741aa |
We were treating the passed in view to the
|
|
|
19741aa |
draw handler as if it was the plugin itself.
|
|
|
19741aa |
---
|
|
|
19741aa |
src/plugins/splash/text/plugin.c | 27 ++-------------------------
|
|
|
19741aa |
1 files changed, 2 insertions(+), 25 deletions(-)
|
|
|
19741aa |
|
|
|
19741aa |
diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
|
|
|
19741aa |
index 6ca7ee1..bb09b22 100644
|
|
|
19741aa |
--- a/src/plugins/splash/text/plugin.c
|
|
|
19741aa |
+++ b/src/plugins/splash/text/plugin.c
|
|
|
19741aa |
@@ -464,37 +464,14 @@ stop_animation (ply_boot_splash_plugin_t *plugin)
|
|
|
19741aa |
}
|
|
|
19741aa |
|
|
|
19741aa |
static void
|
|
|
19741aa |
-clear_views (ply_boot_splash_plugin_t *plugin)
|
|
|
19741aa |
-{
|
|
|
19741aa |
- ply_list_node_t *node;
|
|
|
19741aa |
-
|
|
|
19741aa |
- assert (plugin != NULL);
|
|
|
19741aa |
- assert (plugin->loop != NULL);
|
|
|
19741aa |
-
|
|
|
19741aa |
- node = ply_list_get_first_node (plugin->views);
|
|
|
19741aa |
- while (node != NULL)
|
|
|
19741aa |
- {
|
|
|
19741aa |
- ply_list_node_t *next_node;
|
|
|
19741aa |
- view_t *view;
|
|
|
19741aa |
-
|
|
|
19741aa |
- view = ply_list_node_get_data (node);
|
|
|
19741aa |
- next_node = ply_list_get_next_node (plugin->views, node);
|
|
|
19741aa |
-
|
|
|
19741aa |
- ply_text_display_clear_screen (view->display);
|
|
|
19741aa |
-
|
|
|
19741aa |
- node = next_node;
|
|
|
19741aa |
- }
|
|
|
19741aa |
-}
|
|
|
19741aa |
-
|
|
|
19741aa |
-static void
|
|
|
19741aa |
-on_draw (ply_boot_splash_plugin_t *plugin,
|
|
|
19741aa |
+on_draw (view_t *view,
|
|
|
19741aa |
ply_terminal_t *terminal,
|
|
|
19741aa |
int x,
|
|
|
19741aa |
int y,
|
|
|
19741aa |
int width,
|
|
|
19741aa |
int height)
|
|
|
19741aa |
{
|
|
|
19741aa |
- clear_views (plugin);
|
|
|
19741aa |
+ ply_text_display_clear_screen (view->display);
|
|
|
19741aa |
}
|
|
|
19741aa |
|
|
|
19741aa |
static void
|
|
|
19741aa |
--
|
|
|
19741aa |
1.6.5.rc2
|
|
|
19741aa |
|