From 6fc5c5124e3bcfab118b2c798e026510fa754a82 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <rdenis@simphalempin.com>
Date: Tue, 27 Jan 2009 21:52:44 +0200
Subject: [PATCH] Remove old NODOMAIN stuff (ABI broken anyway)

---
 include/vlc_plugin.h | 13 ----------
 src/modules/entry.c  | 58 --------------------------------------------
 2 files changed, 71 deletions(-)

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 97582d919c..7ec1cef487 100644
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -41,9 +41,6 @@ enum vlc_module_properties
      * Append new items at the end ONLY. */
     VLC_MODULE_CPU_REQUIREMENT,
     VLC_MODULE_SHORTCUT,
-    VLC_MODULE_SHORTNAME_NODOMAIN,
-    VLC_MODULE_DESCRIPTION_NODOMAIN,
-    VLC_MODULE_HELP_NODOMAIN,
     VLC_MODULE_CAPABILITY,
     VLC_MODULE_SCORE,
     VLC_MODULE_CB_OPEN,
@@ -63,9 +60,6 @@ enum vlc_config_properties
     VLC_CONFIG_NAME,
     /* command line name (args=const char *, vlc_callback_t) */
 
-    VLC_CONFIG_DESC_NODOMAIN,
-    /* description (args=const char *, const char *) */
-
     VLC_CONFIG_VALUE,
     /* actual value (args=int/double/const char *) */
 
@@ -96,13 +90,6 @@ enum vlc_config_properties
     VLC_CONFIG_SHORTCUT,
     /* one-character (short) command line option name (args=char) */
 
-    VLC_CONFIG_LIST_NODOMAIN,
-    /* possible values list
-     * (args=size_t, const <type> *, const char *const *) */
-
-    VLC_CONFIG_ADD_ACTION_NODOMAIN,
-    /* add value change callback (args=vlc_callback_t, const char *) */
-
     VLC_CONFIG_OLDNAME,
     /* former option name (args=const char *) */
 
diff --git a/src/modules/entry.c b/src/modules/entry.c
index 5fd41668bd..947803b8bf 100644
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -151,27 +151,6 @@ int vlc_module_set (module_t *module, int propid, ...)
             break;
         }
 
-        case VLC_MODULE_SHORTNAME_NODOMAIN:
-        {
-            const char *name = va_arg (ap, char *);
-            ret = vlc_module_set (module, VLC_MODULE_SHORTNAME, NULL, name);
-            break;
-        }
-
-        case VLC_MODULE_DESCRIPTION_NODOMAIN:
-        {
-            const char *desc = va_arg (ap, char *);
-            ret = vlc_module_set (module, VLC_MODULE_DESCRIPTION, NULL, desc);
-            break;
-        }
-
-        case VLC_MODULE_HELP_NODOMAIN:
-        {
-            const char *help = va_arg (ap, char *);
-            ret = vlc_module_set (module, VLC_MODULE_HELP, NULL, help);
-            break;
-        }
-
         case VLC_MODULE_CAPABILITY:
             module->psz_capability = va_arg (ap, char *);
             break;
@@ -291,14 +270,6 @@ int vlc_config_set (module_config_t *restrict item, int id, ...)
             break;
         }
 
-        case VLC_CONFIG_DESC_NODOMAIN:
-        {
-            const char *text = va_arg (ap, const char *);
-            const char *longtext = va_arg (ap, const char *);
-            ret = vlc_config_set (item, VLC_CONFIG_DESC, NULL, text, longtext);
-            break;
-        }
-
         case VLC_CONFIG_VALUE:
         {
             if (IsConfigIntegerType (item->i_type))
@@ -387,35 +358,6 @@ int vlc_config_set (module_config_t *restrict item, int id, ...)
             ret = 0;
             break;
 
-        case VLC_CONFIG_LIST_NODOMAIN:
-        {
-            size_t len = va_arg (ap, size_t);
-            if (IsConfigIntegerType (item->i_type))
-            {
-                const int *src = va_arg (ap, const int *);
-                const char *const *text = va_arg (ap, const char *const *);
-                ret = vlc_config_set (item, VLC_CONFIG_LIST, NULL, len, src,
-                                      text);
-            }
-            else
-            if (IsConfigStringType (item->i_type))
-            {
-                const char *const *src = va_arg (ap, const char *const *);
-                const char *const *text = va_arg (ap, const char *const *);
-                ret = vlc_config_set (item, VLC_CONFIG_LIST, NULL, len, src,
-                                      text);
-            }
-            break;
-        }
-
-        case VLC_CONFIG_ADD_ACTION_NODOMAIN:
-        {
-            vlc_callback_t cb = va_arg (ap, vlc_callback_t);
-            const char *name = va_arg (ap, const char *);
-            ret = vlc_config_set (item, VLC_CONFIG_ADD_ACTION, NULL, cb, name);
-            break;
-        }
-
         case VLC_CONFIG_OLDNAME:
         {
             const char *oldname = va_arg (ap, const char *);
-- 
2.39.5