diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2009-11-01 22:51:26 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2009-11-01 22:51:26 +0000 |
| commit | 6cdb80d7df997d3220efe03ea6779ba2c81ddf79 (patch) | |
| tree | 8ce274e93fe8882fc25ed61ce5890cbd76c20e5c /apps | |
| parent | 9cd15dad9dd763f0840f0f5386e98bd6437c8593 (diff) | |
| download | rockbox-6cdb80d7df997d3220efe03ea6779ba2c81ddf79.zip rockbox-6cdb80d7df997d3220efe03ea6779ba2c81ddf79.tar.gz rockbox-6cdb80d7df997d3220efe03ea6779ba2c81ddf79.tar.bz2 rockbox-6cdb80d7df997d3220efe03ea6779ba2c81ddf79.tar.xz | |
Revert r23474 "new skin token: %cx - 24 hour time format enabled in the setting.. e.g %?cx<24 hour|12 hour>"
Committed accidentally with a svn/git desynch
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23475 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 1 | ||||
| -rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 6 | ||||
| -rw-r--r-- | apps/gui/skin_engine/skin_tokens.h | 1 |
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 26ccf47..c05ebca 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 6dbceca..46adbdc 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 5f35afc..6d78355 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. */ |