[vlc-commits] commit: Lua: remove 'http' shortcut. ( Jean-Philippe André )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jean-Philippe André <jpeg at videolan.org> | Sun Jun  6 13:44:36 2010 +0800| [b3f85839419a0349395c8270581fa0ca9da80778] | committer: Jean-Philippe André 

Lua: remove 'http' shortcut.

Since 6bb9f2996 (or master/1834c5a73e) it was not possible to load
luahttp using this shortcut anyway.
(cherry picked from commit 4d429b613e427f49a272185dcc26c7d03e7243c7)

Signed-off-by: Jean-Philippe André <jpeg at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=b3f85839419a0349395c8270581fa0ca9da80778
---

 modules/misc/lua/intf.c |    1 +
 modules/misc/lua/vlc.c  |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/modules/misc/lua/intf.c b/modules/misc/lua/intf.c
index 7e36113..fcd64b9 100644
--- a/modules/misc/lua/intf.c
+++ b/modules/misc/lua/intf.c
@@ -78,6 +78,7 @@ static const struct
     { "luatelnet", "telnet" },
     { "telnet", "telnet" },
     { "luahttp", "http" },
+    /* { "http", "http" }, */
     { NULL, NULL } };
 
 static const char *WordInList( const char *psz_list, const char *psz_word )
diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index 2e7b8bd..e44e60d 100644
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -76,7 +76,7 @@ vlc_module_begin ()
         set_description( N_("Interfaces implemented using lua scripts") )
         add_shortcut( "luaintf" )
         add_shortcut( "luahttp" )
-        add_shortcut( "http" )
+        /* add_shortcut( "http" ) */
         add_shortcut( "luatelnet" )
         add_shortcut( "telnet" )
         add_shortcut( "luahotkeys" )