Skip to contentSkip to conversation

remove outdated code

RFC PATCH In review Vladimir Testov 1 participant 1 message Apr 26, 2013

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/2 remove outdated code

Hi folks,

There is some oudated and unused code.

I suggest we should remove it.

Signature · 4 lines
With best regards,
_______________________________
Vladimir Testov, ROSA Laboratory.
www.rosalab.ru
docs/grub.texi +0 -3
diff -Naur grub-new3/docs/grub.texi grub-new4/docs/grub.texi
@@ -1898,9 +1898,6 @@
 @item title-text @tab Specifies the text to display at the top center of the screen as a title.
 @item title-font @tab Defines the font used for the title message at the top of the screen.
 @item title-color @tab Defines the color of the title message.
-@item message-font @tab Defines the font used for messages, such as when GRUB is unable to automatically boot an entry.
-@item message-color @tab Defines the color of the message text.
-@item message-bg-color @tab Defines the background color of the message text area.
 @item desktop-image @tab Specifies the image to use as the background.  It will be scaled to fit the screen size.
 @item desktop-color @tab Specifies the color for the background if *desktop-image* is not specified.
 @item terminal-box @tab Specifies the file name pattern for the styled box slices used for the command line terminal window.  For example, ``terminal-box: terminal_*.png'' will use the images ``terminal_c.png`` as the center area, ``terminal_n.png`` as the north (top) edge, ``terminal_nw.png`` as the northwest (upper left) corner, and so on.  If the image for any slice is not found, it will simply be left empty.
grub-core/gfxmenu/theme_loader.c +3 -3
diff -Naur grub-new3/grub-core/gfxmenu/theme_loader.c grub-new4/grub-core/gfxmenu/theme_loader.c
@@ -126,7 +126,7 @@
   if (! grub_strcmp ("title-font", name))
     view->title_font = grub_font_get (value);
   else if (! grub_strcmp ("message-font", name))
-    view->message_font = grub_font_get (value);
+    return GRUB_ERR_NONE;
   else if (! grub_strcmp ("terminal-font", name))
     {
       grub_free (view->terminal_font_name);
@@ -137,9 +137,9 @@
   else if (! grub_strcmp ("title-color", name))
     grub_video_parse_color (value, &view->title_color);
   else if (! grub_strcmp ("message-color", name))
-    grub_video_parse_color (value, &view->message_color);
+    return GRUB_ERR_NONE;
   else if (! grub_strcmp ("message-bg-color", name))
-    grub_video_parse_color (value, &view->message_bg_color);
+    return GRUB_ERR_NONE;
   else if (! grub_strcmp ("desktop-image", name))
     {
       struct grub_video_bitmap *raw_bitmap;
grub-core/gfxmenu/view.c +0 -116

157 lines not on this page · raw message

include/grub/gfxmenu_view.h +0 -6
diff -Naur grub-new3/include/grub/gfxmenu_view.h grub-new4/include/grub/gfxmenu_view.h
@@ -91,16 +91,12 @@
   grub_video_rect_t screen;
 
   grub_font_t title_font;
-  grub_font_t message_font;
   char *terminal_font_name;
   grub_video_rgba_color_t title_color;
-  grub_video_rgba_color_t message_color;
-  grub_video_rgba_color_t message_bg_color;
   struct grub_video_bitmap *desktop_image;
   grub_video_rgba_color_t desktop_color;
   grub_gfxmenu_box_t terminal_box;
   char *title_text;
-  char *progress_message_text;
   char *theme_path;
 
   grub_gui_container_t canvas;
@@ -109,8 +105,6 @@
 
   int selected;
 
-  grub_video_rect_t progress_message_frame;
-
   grub_menu_t menu;
 
   int nested;