Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix the last of the error

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30464 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2011-09-06 14:07:27 +00:00
parent d2ab44e3f6
commit d43b85c7ed
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/gui/skin_engine/skin_parser.c
View file

@ -1815,6 +1815,9 @@ static int skin_element_callback(struct skin_element* element, void* data)
case SKIN_TOKEN_IMAGE_DISPLAY:
function = parse_image_load;
break;
case SKIN_TOKEN_LIST_ITEM_CFG:
function = parse_listitemviewport;
break;
#endif
#ifdef HAVE_TOUCHSCREEN
case SKIN_TOKEN_TOUCHREGION:
@ -1840,9 +1843,6 @@ static int skin_element_callback(struct skin_element* element, void* data)
function = parse_skinvar;
break;
#endif
case SKIN_TOKEN_LIST_ITEM_CFG:
function = parse_listitemviewport;
break;
default:
break;
}

2
apps/gui/skin_engine/skin_render.c
View file

@ -143,12 +143,12 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info,
}
}
break;
#ifdef HAVE_LCD_BITMAP
case SKIN_TOKEN_LIST_ITEM_CFG:
if (do_refresh)
skinlist_set_cfg(gwps->display->screen_type,
token->value.data);
break;
#ifdef HAVE_LCD_BITMAP
case SKIN_TOKEN_UIVIEWPORT_ENABLE:
sb_set_info_vp(gwps->display->screen_type,
token->value.data);

8
apps/misc.c
View file

@ -1079,22 +1079,22 @@ static enum current_activity
static int current_activity_top = 0;
void push_current_activity(enum current_activity screen)
{
#ifdef HAVE_LCD_BITMAP
#if defined(HAVE_LCD_BITMAP) && !defined(__PCTOOL__)
int i;
#endif
current_activity[current_activity_top++] = screen;
#ifdef HAVE_LCD_BITMAP
#if defined(HAVE_LCD_BITMAP) && !defined(__PCTOOL__)
FOR_NB_SCREENS(i)
skinlist_set_cfg(i, NULL);
#endif
}
void pop_current_activity(void)
{
#ifdef HAVE_LCD_BITMAP
#if defined(HAVE_LCD_BITMAP) && !defined(__PCTOOL__)
int i;
#endif
current_activity_top--;
#ifdef HAVE_LCD_BITMAP
#if defined(HAVE_LCD_BITMAP) && !defined(__PCTOOL__)
FOR_NB_SCREENS(i)
skinlist_set_cfg(i, NULL);
#endif