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

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul  8 22:49:10 2010 +0300| [7cec809dcb5ae68e976bcc35d26edefb4b935e2e] | committer: Rémi Denis-Courmont 

Remove the --user-agent hack

(cherry picked from commit d3b02be6e47870bb1dff74f99bfa510fc4140646)

Conflicts:

	bin/vlc.c

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

 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 53ab86a..759bc32 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -150,11 +150,10 @@ int main( int i_argc, const char *ppsz_argv[] )
     sigdelset (&set, SIGCHLD);
 
     /* 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
@@ -196,7 +195,7 @@ int main( int i_argc, const char *ppsz_argv[] )
         libvlc_release (vlc);
     }
 
-    for (int i = 2; i < argc; i++)
+    for (int i = 1; i < argc; i++)
         LocaleFree (argv[i]);
 
     return 0;
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index f3c188e..445a77e 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -2057,10 +2057,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" )