X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Fncurses%2Fnc-boot-editor.c;h=3d4621b3db75baddda777537179493a524faa131;hb=563ebfa6e702f917d277d4ea9dd5e9eba17e51f7;hp=6bc1d89169b166da53a2eb502ffe12f1545665d5;hpb=494988c501287e03da3becba5c03cbce7c3d9d20;p=petitboot

diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index 6bc1d89..3d4621b 100644
--- a/ui/ncurses/nc-boot-editor.c
+++ b/ui/ncurses/nc-boot-editor.c
@@ -73,7 +73,7 @@ struct boot_editor {
 	char			*args;
 };
 
-extern const char *boot_editor_help_text;
+extern const struct help_text boot_editor_help_text;
 
 static struct boot_editor *boot_editor_from_scr(struct nc_scr *scr)
 {
@@ -222,7 +222,7 @@ static void boot_editor_process_key(struct nc_scr *scr, int key)
 	case STATE_HELP:
 		boot_editor->state = STATE_EDIT;
 		cui_show_help(boot_editor->cui, _("Boot Option Editor"),
-				boot_editor_help_text);
+				&boot_editor_help_text);
 		break;
 	default:
 		break;
@@ -305,7 +305,7 @@ static void boot_editor_layout_widgets(struct boot_editor *boot_editor)
 	y++;
 	widget_move(widget_button_base(boot_editor->widgets.ok_b), y, 9);
 	widget_move(widget_button_base(boot_editor->widgets.help_b), y, 19);
-	widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 29);
+	widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 32);
 }
 
 static void boot_editor_widget_focus(struct nc_widget *widget, void *arg)
@@ -478,9 +478,9 @@ static void boot_editor_setup_widgets(struct boot_editor *boot_editor,
 
 	boot_editor->widgets.ok_b = widget_new_button(set, 0, 0, 6,
 					_("OK"), ok_click, boot_editor);
-	boot_editor->widgets.help_b = widget_new_button(set, 0, 0, 6,
+	boot_editor->widgets.help_b = widget_new_button(set, 0, 0, 9,
 					_("Help"), help_click, boot_editor);
-	boot_editor->widgets.cancel_b = widget_new_button(set, 0, 0, 6,
+	boot_editor->widgets.cancel_b = widget_new_button(set, 0, 0, 9,
 					_("Cancel"), cancel_click, boot_editor);
 }