From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 13 Mar 2010 17:31:04 +0000 (+0200)
Subject: Put only the copyright statement in COPYRIGHT_MESSAGE
X-Git-Tag: 1.1.0-pre1~389
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0db7b28884831a860b0928e118586c2e4f7b790d;p=vlc

Put only the copyright statement in COPYRIGHT_MESSAGE
---

diff --git a/configure.ac b/configure.ac
index a5660dd1f1..b00eed7086 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4699,7 +4699,7 @@ dnl
 dnl  Stuff used by the program
 dnl
 VERSION_MESSAGE="${VERSION} ${CODENAME}"
-COPYRIGHT_MESSAGE="VLC media player - version ${VERSION_MESSAGE} - (c) ${COPYRIGHT_YEARS} the VideoLAN team"
+COPYRIGHT_MESSAGE="Copyright © ${COPYRIGHT_YEARS} the VideoLAN team"
 AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION_MESSAGE}", [Simple version string])
 AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "${COPYRIGHT_MESSAGE}", [Copyright string])
 AC_DEFINE_UNQUOTED(COPYRIGHT_YEARS, "${COPYRIGHT_YEARS}", [The copyright years])
diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index f2f62f98fc..4c0c79f89b 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -121,6 +121,7 @@ VLC_EXPORT( void, libvlc_Quit, ( libvlc_int_t * ) );
          freopen( "CONOUT$", "w", stderr ); \
          freopen( "CONIN$", "r", stdin ); \
          } \
+         msg_Info( p_intf, "VLC media player - %s", VERSION_MESSAGE ); \
          msg_Info( p_intf, "%s", COPYRIGHT_MESSAGE ); \
          msg_Info( p_intf, _("\nWarning: if you can't access the GUI " \
                              "anymore, open a command-line window, go to the " \
diff --git a/src/libvlc.c b/src/libvlc.c
index 6ed2af2ca1..4166bb276c 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -328,6 +328,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
 
     priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" );
     /* Announce who we are - Do it only for first instance ? */
+    msg_Dbg( p_libvlc, "VLC media player - %s", VERSION_MESSAGE );
     msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE );
     msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
     /*xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */