diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-01-30 13:48:44 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-01-30 13:48:44 +0000 |
commit | 9d42e2b39632047b0ba272c03ec154b3931c43de (patch) | |
tree | f0ff2ba1de9aa479fb1476a29d4a701fd8898a1e /apps/settings_menu.c | |
parent | c07eafa7bcc230ff0dd8d45b65bbd21e075dafb0 (diff) | |
download | rockbox-9d42e2b39632047b0ba272c03ec154b3931c43de.tar.gz rockbox-9d42e2b39632047b0ba272c03ec154b3931c43de.zip |
Renamed the config variable for the battery display type to battery_display to get it out of the way for the upcoming battery_type setting for the Ondio. Also seems more logical.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5711 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_menu.c')
-rw-r--r-- | apps/settings_menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 5d045be048..63f1415af8 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -136,14 +136,14 @@ static bool flip_display(void) | |||
136 | /** | 136 | /** |
137 | * Menu to configure the battery display on status bar | 137 | * Menu to configure the battery display on status bar |
138 | */ | 138 | */ |
139 | static bool battery_type(void) | 139 | static bool battery_display(void) |
140 | { | 140 | { |
141 | static const struct opt_items names[] = { | 141 | static const struct opt_items names[] = { |
142 | { STR(LANG_DISPLAY_GRAPHIC) }, | 142 | { STR(LANG_DISPLAY_GRAPHIC) }, |
143 | { STR(LANG_DISPLAY_NUMERIC) } | 143 | { STR(LANG_DISPLAY_NUMERIC) } |
144 | }; | 144 | }; |
145 | return set_option( str(LANG_BATTERY_DISPLAY), | 145 | return set_option( str(LANG_BATTERY_DISPLAY), |
146 | &global_settings.battery_type, INT, names, 2, NULL); | 146 | &global_settings.battery_display, INT, names, 2, NULL); |
147 | } | 147 | } |
148 | 148 | ||
149 | /** | 149 | /** |
@@ -1195,7 +1195,7 @@ static bool bars_settings_menu(void) | |||
1195 | { ID2P(LANG_BUTTON_BAR), button_bar }, | 1195 | { ID2P(LANG_BUTTON_BAR), button_bar }, |
1196 | #endif | 1196 | #endif |
1197 | { ID2P(LANG_VOLUME_DISPLAY), volume_type }, | 1197 | { ID2P(LANG_VOLUME_DISPLAY), volume_type }, |
1198 | { ID2P(LANG_BATTERY_DISPLAY), battery_type }, | 1198 | { ID2P(LANG_BATTERY_DISPLAY), battery_display }, |
1199 | }; | 1199 | }; |
1200 | 1200 | ||
1201 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, | 1201 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |