* Remove Advanced/Misc

[vlc] / modules / gui / wxwidgets / dialogs / preferences.cpp

diff --git a/modules/gui/wxwidgets/dialogs/preferences.cpp b/modules/gui/wxwidgets/dialogs/preferences.cpp
index 875da01a4313eb3230da35545ddca1c2c2ed6ae2..e8d8c5309d8af7fa0a367e17f151fb2e04c3d25b 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/preferences.cpp
+++ b/modules/gui/wxwidgets/dialogs/preferences.cpp
@@ -415,7 +415,14 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
                 break;
             case CONFIG_SUBCATEGORY:
                 if( p_item->i_value == -1 ) break; // Don't display it
+                /* Special case: move the "general" subcategories to their
+                 * parent category */
                 if( p_item->i_value == SUBCAT_VIDEO_GENERAL ||
+                    p_item->i_value == SUBCAT_ADVANCED_MISC ||
+                    p_item->i_value == SUBCAT_INPUT_GENERAL ||
+                    p_item->i_value == SUBCAT_INTERFACE_GENERAL ||
+                    p_item->i_value == SUBCAT_SOUT_GENERAL||
+                    p_item->i_value == SUBCAT_PLAYLIST_GENERAL||
                     p_item->i_value == SUBCAT_AUDIO_GENERAL )
                 {
                     ConfigTreeData *cd = (ConfigTreeData *)