[vlc-commits] commit: Remove the --user-agent hack ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul  8 22:45:34 2010 +0300| [d3b02be6e47870bb1dff74f99bfa510fc4140646] | committer: Rémi Denis-Courmont 

Remove the --user-agent hack

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

 bin/vlc.c           |    5 ++---
 src/libvlc-module.c |    4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/bin/vlc.c b/bin/vlc.c
index e317df1..ef3a4b5 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 72cca55..de04ee2 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" )