diff options
Diffstat (limited to 'apps/gui/skin_engine')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 23b3d27cbb..561eb978a2 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -1245,11 +1245,15 @@ static int parse_progressbar(const char *wps_bufptr, | |||
1245 | using - for any of the params uses "sane" values */ | 1245 | using - for any of the params uses "sane" values */ |
1246 | #ifdef HAVE_LCD_BITMAP | 1246 | #ifdef HAVE_LCD_BITMAP |
1247 | enum { | 1247 | enum { |
1248 | PB_FILENAME = 0, | 1248 | PB_X = 0, |
1249 | PB_X, | ||
1250 | PB_Y, | 1249 | PB_Y, |
1251 | PB_WIDTH, | 1250 | PB_WIDTH, |
1251 | <<<<<<< .mine | ||
1252 | PB_HEIGHT, | 1252 | PB_HEIGHT, |
1253 | PB_FILENAME, | ||
1254 | ======= | ||
1255 | PB_HEIGHT, | ||
1256 | >>>>>>> .r26726 | ||
1253 | }; | 1257 | }; |
1254 | const char *filename; | 1258 | const char *filename; |
1255 | int x, y, height, width; | 1259 | int x, y, height, width; |
@@ -1293,8 +1297,8 @@ static int parse_progressbar(const char *wps_bufptr, | |||
1293 | } | 1297 | } |
1294 | ptr = wps_bufptr + 1; | 1298 | ptr = wps_bufptr + 1; |
1295 | 1299 | ||
1296 | if (!(ptr = parse_list("sdddd", &set, ',', ptr, &filename, | 1300 | if (!(ptr = parse_list("dddds", &set, ',', ptr, |
1297 | &x, &y, &width, &height))) | 1301 | &x, &y, &width, &height, &filename))) |
1298 | return WPS_ERROR_INVALID_PARAM; | 1302 | return WPS_ERROR_INVALID_PARAM; |
1299 | 1303 | ||
1300 | if (LIST_VALUE_PARSED(set, PB_FILENAME)) /* filename */ | 1304 | if (LIST_VALUE_PARSED(set, PB_FILENAME)) /* filename */ |