ui/ncurses: Allow text wrapping in select widgets

[petitboot] / ui / ncurses / nc-menu.c

diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index 7ff2468cb1c47d3b1caae9cf3180523ad920f939..3f09d62385b4df4043e985d965347aad13c905c1 100644 (file)
--- a/ui/ncurses/nc-menu.c
+++ b/ui/ncurses/nc-menu.c
@@ -62,7 +62,6 @@ static int pmenu_post(struct nc_scr *scr)
        result = post_menu(menu->ncm);
 
        nc_scr_frame_draw(scr);
-       redrawwin(menu->scr.main_ncw);
        wrefresh(menu->scr.main_ncw);
 
        return result;
@@ -254,6 +253,7 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
        switch (dev->type) {
        case DEVICE_TYPE_OPTICAL:
        case DEVICE_TYPE_DISK:
+       case DEVICE_TYPE_USB:
                /* Find block info */
                for (i = 0; sys && i < sys->n_blockdevs; i++) {
                        bd = sys->blockdevs[i];
@@ -264,8 +264,7 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
                }
                if (matched) {
                        snprintf(buf,sizeof(buf),"[%s: %s / %s]",
-                               dev->type == DEVICE_TYPE_DISK ?
-                                       _("Disk") : _("CD/DVD"),
+                               device_type_display_name(dev->type),
                                bd->name, bd->uuid);
                }
                break;