diff options
Diffstat (limited to 'apps/gui/skin_engine/wps_parser.c')
-rw-r--r-- | apps/gui/skin_engine/wps_parser.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/gui/skin_engine/wps_parser.c b/apps/gui/skin_engine/wps_parser.c index a3e5f6861d..2c6d5ded95 100644 --- a/apps/gui/skin_engine/wps_parser.c +++ b/apps/gui/skin_engine/wps_parser.c | |||
@@ -1552,7 +1552,7 @@ static void wps_images_clear(struct wps_data *data) | |||
1552 | #endif | 1552 | #endif |
1553 | 1553 | ||
1554 | /* initial setup of wps_data */ | 1554 | /* initial setup of wps_data */ |
1555 | void wps_data_init(struct wps_data *wps_data) | 1555 | void skin_data_init(struct wps_data *wps_data) |
1556 | { | 1556 | { |
1557 | #ifdef HAVE_LCD_BITMAP | 1557 | #ifdef HAVE_LCD_BITMAP |
1558 | wps_images_clear(wps_data); | 1558 | wps_images_clear(wps_data); |
@@ -1581,7 +1581,7 @@ static void wps_reset(struct wps_data *data) | |||
1581 | bool rwps = data->remote_wps; /* remember whether the data is for a RWPS */ | 1581 | bool rwps = data->remote_wps; /* remember whether the data is for a RWPS */ |
1582 | #endif | 1582 | #endif |
1583 | memset(data, 0, sizeof(*data)); | 1583 | memset(data, 0, sizeof(*data)); |
1584 | wps_data_init(data); | 1584 | skin_data_init(data); |
1585 | #ifdef HAVE_REMOTE_LCD | 1585 | #ifdef HAVE_REMOTE_LCD |
1586 | data->remote_wps = rwps; | 1586 | data->remote_wps = rwps; |
1587 | #endif | 1587 | #endif |
@@ -1666,7 +1666,7 @@ static bool load_wps_bitmaps(struct wps_data *wps_data, char *bmpdir) | |||
1666 | 1666 | ||
1667 | /* to setup up the wps-data from a format-buffer (isfile = false) | 1667 | /* to setup up the wps-data from a format-buffer (isfile = false) |
1668 | from a (wps-)file (isfile = true)*/ | 1668 | from a (wps-)file (isfile = true)*/ |
1669 | static bool wps_data_load(struct wps_data *wps_data, | 1669 | static bool _skin_data_load(struct wps_data *wps_data, |
1670 | struct screen *display, | 1670 | struct screen *display, |
1671 | const char *buf, | 1671 | const char *buf, |
1672 | bool isfile) | 1672 | bool isfile) |
@@ -1820,7 +1820,7 @@ void skin_data_load(struct wps_data *wps_data, | |||
1820 | const char *buf, | 1820 | const char *buf, |
1821 | bool isfile) | 1821 | bool isfile) |
1822 | { | 1822 | { |
1823 | bool loaded_ok = buf && wps_data_load(wps_data, display, buf, isfile); | 1823 | bool loaded_ok = buf && _skin_data_load(wps_data, display, buf, isfile); |
1824 | if (!loaded_ok) /* load the hardcoded default */ | 1824 | if (!loaded_ok) /* load the hardcoded default */ |
1825 | { | 1825 | { |
1826 | /* set the default wps for the main-screen */ | 1826 | /* set the default wps for the main-screen */ |
@@ -1829,7 +1829,7 @@ void skin_data_load(struct wps_data *wps_data, | |||
1829 | #if LCD_DEPTH > 1 | 1829 | #if LCD_DEPTH > 1 |
1830 | unload_wps_backdrop(); | 1830 | unload_wps_backdrop(); |
1831 | #endif | 1831 | #endif |
1832 | wps_data_load(wps_data, | 1832 | _skin_data_load(wps_data, |
1833 | display, | 1833 | display, |
1834 | #ifdef HAVE_LCD_BITMAP | 1834 | #ifdef HAVE_LCD_BITMAP |
1835 | "%s%?it<%?in<%in. |>%it|%fn>\n" | 1835 | "%s%?it<%?in<%in. |>%it|%fn>\n" |
@@ -1852,7 +1852,7 @@ void skin_data_load(struct wps_data *wps_data, | |||
1852 | #if LCD_REMOTE_DEPTH > 1 | 1852 | #if LCD_REMOTE_DEPTH > 1 |
1853 | unload_remote_wps_backdrop(); | 1853 | unload_remote_wps_backdrop(); |
1854 | #endif | 1854 | #endif |
1855 | wps_data_load(wps_data, | 1855 | _skin_data_load(wps_data, |
1856 | display, | 1856 | display, |
1857 | "%s%?ia<%ia|%?d2<%d2|(root)>>\n" | 1857 | "%s%?ia<%ia|%?d2<%d2|(root)>>\n" |
1858 | "%s%?it<%?in<%in. |>%it|%fn>\n" | 1858 | "%s%?it<%?in<%in. |>%it|%fn>\n" |