fix that disktidy plugin and shopper plugin is not usable when Show Icons setting is turned off.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28362 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 3 insertions, 6 deletions

diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index 4323bb0350..ec12ee5367 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -331,7 +331,7 @@ void list_draw(struct screen *display, struct gui_synclist *list)
         }
         /* do the icon */
         display->set_viewport(&list_icons);
-        if (list->callback_get_item_icon && global_settings.show_icons)
+        if (list->callback_get_item_icon != NULL)
         {
             screen_put_icon_with_offset(display, show_cursor?1:0,
                                     (line),show_cursor?ICON_PADDING:0,draw_offset,
@@ -468,7 +468,7 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list)
         return ACTION_NONE;
 
     /* x and y are relative to info_vp */
-    if (global_settings.show_icons)
+    if (gui_list->callback_get_item_icon != NULL)
         icon_width += get_icon_width(screen);
     if (show_cursor)
         icon_width += get_icon_width(screen);
diff --git a/apps/gui/charcell/list.c b/apps/gui/charcell/list.c
index 8eebfe7fa1..a0ab02841f 100644
--- a/apps/gui/charcell/list.c
+++ b/apps/gui/charcell/list.c
@@ -51,8 +51,7 @@ void gui_synclist_scroll_stop(struct gui_synclist *lists)
 void list_draw(struct screen *display, struct gui_synclist *gui_list)
 {
     int text_pos;
-    bool draw_icons = (gui_list->callback_get_item_icon != NULL &&
-                       global_settings.show_icons);
+    bool draw_icons = (gui_list->callback_get_item_icon != NULL);
     bool draw_cursor;
     int i;
     int lines;
diff --git a/apps/plugins/disktidy.c b/apps/plugins/disktidy.c
index 1e6c1536e2..df0076f93d 100644
--- a/apps/plugins/disktidy.c
+++ b/apps/plugins/disktidy.c
@@ -496,7 +496,6 @@ enum tidy_return tidy_lcd_menu(void)
 
             case 1:
             {
-                bool show_icons = rb->global_settings->show_icons;
                 struct simplelist_info list;
                 rb->simplelist_info_init(&list, "Files to Clean",
                                          tidy_type_count, NULL);
@@ -504,7 +503,6 @@ enum tidy_return tidy_lcd_menu(void)
                 list.get_name = get_name;
                 list.action_callback = list_action_callback;
                 rb->simplelist_show_list(&list);
-                rb->global_settings->show_icons = show_icons;
             }
             break;