From da5de22d17760a4043b3f71cff37dc85671d3c73 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 29 Jul 2014 07:20:37 +0200
Subject: [PATCH] (Menu) Change MENU_SETTINGS_CONTENT_HISTORY_PATH to
 MENU_CONTENT_HISTORY_PATH

---
 frontend/menu/backend/menu_common_backend.c | 16 ++++++++--------
 frontend/menu/backend/menu_common_backend.h |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index 65ce0d7169..d34e62d959 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -407,7 +407,7 @@ static void menu_common_entries_init(void *data, unsigned menu_type)
             file_list_push(menu->selection_buf, current_setting->short_description, MENU_LIBRETRO_INFO_DIR_PATH, 0);
 
          if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "game_history_path")))
-            file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_CONTENT_HISTORY_PATH, 0);
+            file_list_push(menu->selection_buf, current_setting->short_description, MENU_CONTENT_HISTORY_PATH, 0);
 #ifdef HAVE_DYLIB
          file_list_push(menu->selection_buf, "Software Filter Directory", MENU_FILTER_DIR_PATH, 0);
 #endif
@@ -1583,7 +1583,7 @@ static int menu_settings_iterate(unsigned action)
             menu_type == MENU_SETTINGS_VIDEO_SOFTFILTER ||
             menu_type == MENU_SETTINGS_AUDIO_DSP_FILTER ||
             menu_type == MENU_SETTINGS_OVERLAY_PRESET ||
-            menu_type == MENU_SETTINGS_CONTENT_HISTORY_PATH ||
+            menu_type == MENU_CONTENT_HISTORY_PATH ||
             menu_type == MENU_SETTINGS_CORE ||
             menu_type == MENU_SETTINGS_CONFIG ||
             menu_type == MENU_SETTINGS_DISK_APPEND ||
@@ -1941,7 +1941,7 @@ static void menu_parse_and_resolve(unsigned menu_type)
                exts = "dsp";
             else if (menu_type == MENU_SETTINGS_OVERLAY_PRESET)
                exts = "cfg";
-            else if (menu_type == MENU_SETTINGS_CONTENT_HISTORY_PATH)
+            else if (menu_type == MENU_CONTENT_HISTORY_PATH)
                exts = "cfg";
             else if (menu_common_type_is(menu_type) == MENU_FILE_DIRECTORY)
                exts = ""; // we ignore files anyway
@@ -2384,7 +2384,7 @@ static int menu_common_iterate(unsigned action)
                type == MENU_SETTINGS_OVERLAY_PRESET ||
                type == MENU_SETTINGS_VIDEO_SOFTFILTER ||
                type == MENU_SETTINGS_AUDIO_DSP_FILTER ||
-               type == MENU_SETTINGS_CONTENT_HISTORY_PATH ||
+               type == MENU_CONTENT_HISTORY_PATH ||
                type == MENU_SETTINGS_CORE ||
                type == MENU_SETTINGS_CONFIG ||
                type == MENU_SETTINGS_DISK_APPEND ||
@@ -2502,7 +2502,7 @@ static int menu_common_iterate(unsigned action)
                menu_flush_stack_type(MENU_SETTINGS);
                ret = -1;
             }
-            else if (menu_type == MENU_SETTINGS_CONTENT_HISTORY_PATH)
+            else if (menu_type == MENU_CONTENT_HISTORY_PATH)
             {
                if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "game_history_path")))
                   menu_common_setting_set_current_string_path(current_setting, dir, path);
@@ -2680,7 +2680,7 @@ static int menu_common_iterate(unsigned action)
             menu_common_type_is(menu_type) == MENU_SETTINGS_SHADER_OPTIONS ||
             menu_common_type_is(menu_type) == MENU_FILE_DIRECTORY ||
             menu_type == MENU_SETTINGS_OVERLAY_PRESET ||
-            menu_type == MENU_SETTINGS_CONTENT_HISTORY_PATH ||
+            menu_type == MENU_CONTENT_HISTORY_PATH ||
             menu_type == MENU_SETTINGS_VIDEO_SOFTFILTER ||
             menu_type == MENU_SETTINGS_AUDIO_DSP_FILTER ||
             menu_type == MENU_SETTINGS_DEFERRED_CORE ||
@@ -3689,7 +3689,7 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
          }
          break;
 #endif
-      case MENU_SETTINGS_CONTENT_HISTORY_PATH:
+      case MENU_CONTENT_HISTORY_PATH:
          switch (action)
          {
             case MENU_ACTION_OK:
@@ -4930,7 +4930,7 @@ static void menu_common_setting_set_label(char *type_str, size_t type_str_size,
             snprintf(type_str, type_str_size, "%.2f", g_settings.input.overlay_scale);
             break;
 #endif
-         case MENU_SETTINGS_CONTENT_HISTORY_PATH:
+         case MENU_CONTENT_HISTORY_PATH:
             strlcpy(type_str, g_settings.content_history_path ? g_settings.content_history_path : "<None>", type_str_size);
             break;
          case MENU_SETTINGS_BIND_PLAYER:
diff --git a/frontend/menu/backend/menu_common_backend.h b/frontend/menu/backend/menu_common_backend.h
index a7c219bbf7..a76ab3a598 100644
--- a/frontend/menu/backend/menu_common_backend.h
+++ b/frontend/menu/backend/menu_common_backend.h
@@ -133,6 +133,7 @@ typedef enum
    MENU_CONTENT_HISTORY_SIZE,
    MENU_SCREENSHOT_DIR_PATH,
    MENU_BROWSER_DIR_PATH,
+   MENU_CONTENT_HISTORY_PATH,
    MENU_CONTENT_DIR_PATH,
    MENU_ASSETS_DIR_PATH,
    MENU_FILTER_DIR_PATH,
@@ -147,7 +148,6 @@ typedef enum
    MENU_SYSTEM_DIR_PATH,
    MENU_AUTOCONFIG_DIR_PATH,
    MENU_EXTRACTION_DIR_PATH,
-   MENU_SETTINGS_CONTENT_HISTORY_PATH,
    MENU_SETTINGS_RESTART_GAME,
    MENU_SETTINGS_AUDIO_DSP_FILTER,
    MENU_SETTINGS_AUDIO_ENABLE,