From: Rémi Denis-Courmont <remi@remlab.net>
Date: Thu, 8 Jul 2010 19:45:34 +0000 (+0300)
Subject: Remove the --user-agent hack
X-Git-Tag: 1.2.0-pre1~5898
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d3b02be6e47870bb1dff74f99bfa510fc4140646;p=vlc

Remove the --user-agent hack
---

diff --git a/bin/vlc.c b/bin/vlc.c
index e317df119c..ef3a4b511e 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -166,11 +166,10 @@ int main( int i_argc, const char *ppsz_argv[] )
     pthread_sigmask (SIG_BLOCK, &set, NULL);
 
     /* Note that FromLocale() can be used before libvlc is initialized */
-    const char *argv[i_argc + 4];
+    const char *argv[i_argc + 3];
     int argc = 0;
 
     argv[argc++] = "--no-ignore-config";
-    argv[argc++] = "--user-agent=\"VLC media player\"";
 #ifdef TOP_BUILDDIR
     argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules");
 #endif
@@ -224,7 +223,7 @@ int main( int i_argc, const char *ppsz_argv[] )
 out:
     if (vlc != NULL)
         libvlc_release (vlc);
-    for (int i = 2; i < argc; i++)
+    for (int i = 1; i < argc; i++)
         LocaleFree (argv[i]);
 
 #ifdef RTLD_NOLOAD
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 72cca5574c..de04ee2dc7 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -2061,10 +2061,6 @@ vlc_module_begin ()
                    DATA_PATH_LONGTEXT, true )
         change_need_restart ()
 
-    add_string( "user-agent", "(LibVLC "VERSION")", NULL, NULL, NULL, true )
-        change_safe ()
-        change_private ()
-
     set_section( N_("Performance options"), NULL )
     add_obsolete_bool( "minimize-threads" )