From dbfffa2a25fa5fbcbe5346599facb23eaa337972 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 14 Feb 2009 13:55:19 +0200 Subject: [PATCH] Remove all uses of VLC_Changeset --- modules/control/http/http.c | 1 - modules/gui/macosx/about.m | 9 ++------- modules/gui/qt4/dialogs/help.cpp | 1 - src/control/core.c | 2 +- src/libvlc.c | 3 --- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/modules/control/http/http.c b/modules/control/http/http.c index 9f1bdf438a..5bce03bfcb 100644 --- a/modules/control/http/http.c +++ b/modules/control/http/http.c @@ -432,7 +432,6 @@ static void ParseExecute( httpd_file_sys_t *p_args, char *p_buffer, mvar_AppendNewVar( p_args->vars, "vlc_compile_domain", VLC_CompileDomain() ); mvar_AppendNewVar( p_args->vars, "vlc_compiler", VLC_Compiler() ); - mvar_AppendNewVar( p_args->vars, "vlc_changeset", VLC_Changeset() ); mvar_AppendNewVar( p_args->vars, "stream_position", position ); mvar_AppendNewVar( p_args->vars, "stream_time", time ); mvar_AppendNewVar( p_args->vars, "stream_length", length ); diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m index 9ad77b9ad7..a6b42bc9ed 100644 --- a/modules/gui/macosx/about.m +++ b/modules/gui/macosx/about.m @@ -86,13 +86,8 @@ static VLAboutBox *_o_sharedInstance = nil; [o_about_window setTitle: _NS("About VLC media player")]; /* setup the creator / revision field */ - if( VLC_Changeset() != "exported" ) - [o_revision_field setStringValue: - [NSString stringWithFormat: _NS("Compiled by %s, based on Git commit %s"), - VLC_CompileBy(), VLC_Changeset()]]; - else - [o_revision_field setStringValue: - [NSString stringWithFormat: _NS("Compiled by %s"), VLC_CompileBy()]]; + [o_revision_field setStringValue: + [NSString stringWithFormat: _NS("Compiled by %s"), VLC_CompileBy()]]; /* Setup the nameversion field */ [o_name_version_field setStringValue: [NSString stringWithFormat:@"Version %s (%s)", VLC_Version(), PLATFORM]]; diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp index cc72ff7467..563edb100d 100644 --- a/modules/gui/qt4/dialogs/help.cpp +++ b/modules/gui/qt4/dialogs/help.cpp @@ -120,7 +120,6 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf) + qfu( VLC_CompileBy() )+ "@" + qfu( VLC_CompileHost() ) + "." + qfu( VLC_CompileDomain() ) + ".\n" + qtr( "Compiler: " ) + qfu( VLC_Compiler() ) + ".\n" - + qtr( "Based on Git commit: " ) + qfu( VLC_Changeset() ) + ".\n" + qtr( "You are using the Qt4 Interface.\n\n" ) + qtr( "Copyright (C) " ) + COPYRIGHT_YEARS + qtr( " by the VideoLAN Team.\n" ) diff --git a/src/control/core.c b/src/control/core.c index f475f441b7..af592b9dd9 100644 --- a/src/control/core.c +++ b/src/control/core.c @@ -206,7 +206,7 @@ const char * libvlc_get_compiler(void) const char * libvlc_get_changeset(void) { - return VLC_Changeset(); + return "exported"; } /* export internal libvlc_instance for ugly hacks with libvlccore */ diff --git a/src/libvlc.c b/src/libvlc.c index 675a913f9e..9456bb6073 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -1982,9 +1982,6 @@ static void Version( void ) utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"), VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() ); utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() ); - if( strcmp( VLC_Changeset(), "exported" ) ) - utf8_fprintf( stdout, _("Based upon Git commit [%s]\n"), - VLC_Changeset() ); utf8_fprintf( stdout, LICENSE_MSG ); #ifdef WIN32 /* Pause the console because it's destroyed when we exit */ -- 2.39.2