|
 |
31004e6 |
From f11cb55e6d2efcccb2be34942622f18a40dd1218 Mon Sep 17 00:00:00 2001
|
|
|
31004e6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
Date: Fri, 3 May 2013 14:02:49 +0200
|
|
|
f74b50e |
Subject: [PATCH 407/482] * grub-core/gfxmenu/view.c
|
|
|
31004e6 |
(grub_gfxmenu_view_new): Clear grub_gfxmenu_timeout_notifications.
|
|
|
31004e6 |
(grub_gfxmenu_view_destroy): Likewise.
|
|
|
31004e6 |
|
|
|
31004e6 |
---
|
|
|
31004e6 |
ChangeLog | 6 ++++++
|
|
|
31004e6 |
grub-core/gfxmenu/view.c | 15 +++++++++++++++
|
|
|
31004e6 |
2 files changed, 21 insertions(+)
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
31004e6 |
index 9e99eb5..858f0b0 100644
|
|
|
31004e6 |
--- a/ChangeLog
|
|
|
31004e6 |
+++ b/ChangeLog
|
|
|
31004e6 |
@@ -1,5 +1,11 @@
|
|
|
31004e6 |
2013-05-03 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
|
|
|
31004e6 |
+ * grub-core/gfxmenu/view.c (grub_gfxmenu_view_new): Clear
|
|
|
31004e6 |
+ grub_gfxmenu_timeout_notifications.
|
|
|
31004e6 |
+ (grub_gfxmenu_view_destroy): Likewise.
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+2013-05-03 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
+
|
|
|
31004e6 |
* grub-core/normal/term.c (print_ucs4_real): Fix startwidth in dry run.
|
|
|
31004e6 |
|
|
|
31004e6 |
2013-05-02 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
diff --git a/grub-core/gfxmenu/view.c b/grub-core/gfxmenu/view.c
|
|
|
31004e6 |
index 475fc76..bcf6399 100644
|
|
|
31004e6 |
--- a/grub-core/gfxmenu/view.c
|
|
|
31004e6 |
+++ b/grub-core/gfxmenu/view.c
|
|
|
31004e6 |
@@ -58,6 +58,14 @@ grub_gfxmenu_view_new (const char *theme_path,
|
|
|
31004e6 |
if (! view)
|
|
|
31004e6 |
return 0;
|
|
|
31004e6 |
|
|
|
31004e6 |
+ while (grub_gfxmenu_timeout_notifications)
|
|
|
31004e6 |
+ {
|
|
|
31004e6 |
+ struct grub_gfxmenu_timeout_notify *p;
|
|
|
31004e6 |
+ p = grub_gfxmenu_timeout_notifications;
|
|
|
31004e6 |
+ grub_gfxmenu_timeout_notifications = grub_gfxmenu_timeout_notifications->next;
|
|
|
31004e6 |
+ grub_free (p);
|
|
|
31004e6 |
+ }
|
|
|
31004e6 |
+
|
|
|
31004e6 |
view->screen.x = 0;
|
|
|
31004e6 |
view->screen.y = 0;
|
|
|
31004e6 |
view->screen.width = width;
|
|
|
31004e6 |
@@ -105,6 +113,13 @@ grub_gfxmenu_view_destroy (grub_gfxmenu_view_t view)
|
|
|
31004e6 |
{
|
|
|
31004e6 |
if (!view)
|
|
|
31004e6 |
return;
|
|
|
31004e6 |
+ while (grub_gfxmenu_timeout_notifications)
|
|
|
31004e6 |
+ {
|
|
|
31004e6 |
+ struct grub_gfxmenu_timeout_notify *p;
|
|
|
31004e6 |
+ p = grub_gfxmenu_timeout_notifications;
|
|
|
31004e6 |
+ grub_gfxmenu_timeout_notifications = grub_gfxmenu_timeout_notifications->next;
|
|
|
31004e6 |
+ grub_free (p);
|
|
|
31004e6 |
+ }
|
|
|
31004e6 |
grub_video_bitmap_destroy (view->desktop_image);
|
|
|
31004e6 |
if (view->terminal_box)
|
|
|
31004e6 |
view->terminal_box->destroy (view->terminal_box);
|
|
|
31004e6 |
--
|
|
|
31004e6 |
1.8.2.1
|
|
|
31004e6 |
|