summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2009-11-01 21:45:01 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2009-11-01 21:45:01 +0000
commite702e5dbf8f0d6e6d2938db60af6a6d4af806342 (patch)
tree8ce274e93fe8882fc25ed61ce5890cbd76c20e5c /apps/gui
parentcb8527d073cccbf044330c60d41aec50ca2536b5 (diff)
revert that last checkin... something better is coming
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23473 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/skin_engine/skin_parser.c1
-rw-r--r--apps/gui/skin_engine/skin_tokens.c6
-rw-r--r--apps/gui/skin_engine/skin_tokens.h1
3 files changed, 0 insertions, 8 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 26ccf47335..c05ebca45e 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -200,7 +200,6 @@ static const struct wps_tag all_tags[] = {
#endif
{ WPS_TOKEN_RTC_PRESENT , "cc", WPS_REFRESH_STATIC, NULL },
- { WPS_TOKEN_RTC_24HR_SETTING_MODE, "cx", WPS_REFRESH_STATIC, NULL },
{ WPS_TOKEN_RTC_DAY_OF_MONTH, "cd", WPS_RTC_REFRESH, NULL },
{ WPS_TOKEN_RTC_DAY_OF_MONTH_BLANK_PADDED,"ce", WPS_RTC_REFRESH, NULL },
{ WPS_TOKEN_RTC_12HOUR_CFG, "cf", WPS_RTC_REFRESH, NULL },
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 6dbceca906..46adbdc097 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -569,12 +569,6 @@ const char *get_token_value(struct gui_wps *gwps,
#else
return NULL;
#endif
- case WPS_TOKEN_RTC_24HR_SETTING_MODE:
-#if CONFIG_RTC
- return global_settings.timeformat?NULL:"z";
-#else
- return NULL;
-#endif
#if CONFIG_RTC
case WPS_TOKEN_RTC_12HOUR_CFG:
diff --git a/apps/gui/skin_engine/skin_tokens.h b/apps/gui/skin_engine/skin_tokens.h
index 5f35afc274..6d783551e6 100644
--- a/apps/gui/skin_engine/skin_tokens.h
+++ b/apps/gui/skin_engine/skin_tokens.h
@@ -62,7 +62,6 @@ enum wps_token_type {
/* Time */
WPS_TOKEN_RTC_PRESENT,
- WPS_TOKEN_RTC_24HR_SETTING_MODE,
/* The begin/end values allow us to know if a token is an RTC one.
New RTC tokens should be added between the markers. */