summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-02-08 11:12:22 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-02-08 11:12:22 +0000
commit9bb864b82ae6ebf7e1fd29cae84db3ee8b2f048f (patch)
tree9d8ad1462df9b7ea41c1620003078d980f040be9
parent217ad16850e17ebce914af790eb1d31b818eaadb (diff)
unstatic the string buffer, fix the recording setting lang, change the
menu title... aparently im the only one who thinks it should match the logo... git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12233 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/menu.c2
-rw-r--r--apps/menus/main_menu.c2
-rw-r--r--apps/menus/recording_menu.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/menu.c b/apps/menu.c
index dee720b4cb..f5d40f1a98 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -643,7 +643,7 @@ int do_menu(const struct menu_item_ex *start_menu)
else if (setting->flags&F_CHOICE_SETTING)
{
static struct opt_items options[MAX_OPTIONS];
- static char buffer[256];
+ char buffer[256];
char *buf_start = buffer;
int buf_free = 256;
int i,j, count = setting->choice_setting->count;
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index e830f4bbc7..daceaa4118 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -87,7 +87,7 @@ MENUITEM_FUNCTION(do_shutdown_item, ID2P(LANG_SHUTDOWN), do_shutdown, NULL);
/* NOTE: This title will be translatable once we decide what to call this menu
when the root menu comes in... hopefully in the next few days */
-MAKE_MENU(main_menu_, "ROCKbox Main Menu", NULL,
+MAKE_MENU(main_menu_, "Rockbox Main Menu", NULL,
&mrb_bookmarks, &sound_settings,
&settings_menu_item, &manage_settings_menu_item, &browse_themes,
#ifdef CONFIG_TUNER
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c
index d1aed69dea..ef22932683 100644
--- a/apps/menus/recording_menu.c
+++ b/apps/menus/recording_menu.c
@@ -33,7 +33,7 @@ MENUITEM_FUNCTION(rec_menu_recording_screen_item, ID2P(LANG_RECORDING_MENU),
(menu_function)recording_screen, NULL);
/* TEMP */
bool recording_menu(bool no_source); /* from apps/sound_menu.h */
-MENUITEM_FUNCTION_WPARAM(recording_settings, ID2P(LANG_RECORDING_MENU),
+MENUITEM_FUNCTION_WPARAM(recording_settings, ID2P(LANG_RECORDING_SETTINGS),
(int (*)(void*))recording_menu,0, NULL);
MAKE_MENU(recording_settings_menu,ID2P(LANG_RECORDING),0,