Guest User

Untitled

a guest
Oct 17th, 2011
74
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/apps/features.txt b/apps/features.txt
  2. index 44ef3dd..48de014 100644
  3. --- a/apps/features.txt
  4. +++ b/apps/features.txt
  5. @@ -154,10 +154,6 @@ rtc
  6. serial_port
  7. #endif
  8.  
  9. -#if defined(ARCHOS_RECORDER) || defined(ARCHOS_PLAYER)
  10. -soft_shutdown
  11. -#endif
  12. -
  13. #if defined(HAVE_SPDIF_POWER)
  14. spdif_power
  15. #endif
  16. diff --git a/apps/lang/english.lang b/apps/lang/english.lang
  17. index 5ee087e..cd7d736 100644
  18. --- a/apps/lang/english.lang
  19. +++ b/apps/lang/english.lang
  20. @@ -6617,16 +6617,13 @@
  21. desc: in main menu
  22. user: core
  23. <source>
  24. - *: none
  25. - soft_shutdown: "Shut down"
  26. + *: "Shut down"
  27. </source>
  28. <dest>
  29. - *: none
  30. - soft_shutdown: "Shut down"
  31. + *: "Shut down"
  32. </dest>
  33. <voice>
  34. - *: none
  35. - soft_shutdown: "Shut down"
  36. + *: "Shut down"
  37. </voice>
  38. </phrase>
  39. <phrase>
  40. diff --git a/apps/root_menu.c b/apps/root_menu.c
  41. index 472c1db..2ef2631 100644
  42. --- a/apps/root_menu.c
  43. +++ b/apps/root_menu.c
  44. @@ -461,7 +461,6 @@ MENUITEM_RETURNVALUE(playlists, ID2P(LANG_CATALOG), GO_TO_PLAYLISTS_SCREEN,
  45. MENUITEM_RETURNVALUE(system_menu_, ID2P(LANG_SYSTEM), GO_TO_SYSTEM_SCREEN,
  46. NULL, Icon_System_menu);
  47.  
  48. -#if CONFIG_KEYPAD == PLAYER_PAD
  49. static int do_shutdown(void)
  50. {
  51. #if CONFIG_CHARGING
  52. @@ -474,7 +473,7 @@ static int do_shutdown(void)
  53. }
  54. MENUITEM_FUNCTION(do_shutdown_item, 0, ID2P(LANG_SHUTDOWN),
  55. do_shutdown, NULL, NULL, Icon_NOICON);
  56. -#endif
  57. +
  58. MAKE_MENU(root_menu_, ID2P(LANG_ROCKBOX_TITLE),
  59. item_callback, Icon_Rockbox,
  60. &bookmarks, &file_browser,
  61. @@ -488,11 +487,7 @@ MAKE_MENU(root_menu_, ID2P(LANG_ROCKBOX_TITLE),
  62. #if CONFIG_TUNER
  63. &fm,
  64. #endif
  65. - &playlists, &rocks_browser, &system_menu_
  66. -
  67. -#if CONFIG_KEYPAD == PLAYER_PAD
  68. - ,&do_shutdown_item
  69. -#endif
  70. + &playlists, &rocks_browser, &system_menu_, &do_shutdown_item
  71. );
  72.  
  73. static int item_callback(int action, const struct menu_item_ex *this_item)
  74.  
  75.  
RAW Paste Data