Put licensing terms instead of description in about boxes

diff --git a/include/vlc/vlc.h b/include/vlc/vlc.h
index bcd2ce12f710a9a5fc8614db7b0dbc9882418aa0..a5e351b2074c46b1df1276d84763e63cd6c30539 100644 (file)
--- a/include/vlc/vlc.h
+++ b/include/vlc/vlc.h
@@ -572,4 +572,10 @@ int             VLC_FullScreen( int );
 }
 # endif
 
+#define LICENSE_MSG \
+  _("This program comes with NO WARRANTY, to the extent permitted by " \
+    "law.\nYou may redistribute it under the terms of the GNU General " \
+    "Public License;\nsee the file named COPYING for details.\n" \
+    "Written by the VideoLAN team; see the AUTHORS file.\n")
+
 #endif /* <vlc/vlc.h> */

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 1ca13920d06a6ba41c4e4c5877eabcd8d3dfec67..4dab19532a8b5dbe1e8669bbf0a4f80523679aaf 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -163,12 +163,4 @@ VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
 #define INTF_DIALOG_EXIT       99
 
 /* Useful text messages shared by interfaces */
-#define INTF_ABOUT_MSG \
-    _( "VLC is an open-source and cross-platform multimedia " \
-       "player for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, " \
-       "DivX, mp3, Ogg, etc.) as well as DVDs, VCDs, CD audio, and various " \
-       "streaming protocols.\n\n" \
-       "VLC is also a streaming server with transcoding capabilities " \
-       "(UDP unicast and multicast, HTTP, etc.) mainly designed for " \
-       "high-bandwidth networks.\n\n"\
-       "For more information, have a look at the web site." )
+#define INTF_ABOUT_MSG LICENSE_MSG

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index 8e119b6e5d975935b67cddc37401d7eba5197f8a..66786c0782720a520d8e6fb979fd2d94c95a5b12 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -952,9 +952,9 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
        wxU(_("Compiler: "))+ wxU(VLC_Compiler())+wxT( ".\n") +
        wxU(_("Based on SVN revision: "))+wxU(VLC_Changeset())+wxT(".\n\n") +
 #ifdef __WXMSW__
-        wxU( vlc_wraptext(INTF_ABOUT_MSG,WRAPCOUNT,VLC_TRUE) ) + wxT("\n\n") +
+        wxU( vlc_wraptext(LICENSE_MSG,WRAPCOUNT,VLC_TRUE) ) + wxT("\n\n") +
 #else
-        wxU( INTF_ABOUT_MSG ) + wxT("\n\n") +
+        wxU( LICENSE_MSG ) + wxT("\n\n") +
 #endif
         wxU(_("The VideoLAN team <videolan@videolan.org>\n"
               "http://www.videolan.org/\n\n")) );

diff --git a/src/libvlc.c b/src/libvlc.c
index 560beef093b27a1c890a73592734b4a106e8ee60..1bb5f0b7fea8a223381642a6e42c7620029ecbd3 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -2433,11 +2433,7 @@ static void Version( void )
     if( strcmp( VLC_Changeset(), "exported" ) )
         fprintf( stdout, _("Based upon svn changeset [%s]\n"),
                  VLC_Changeset() );
-    fprintf( stdout,
-      _("This program comes with NO WARRANTY, to the extent permitted by "
-        "law.\nYou may redistribute it under the terms of the GNU General "
-        "Public License;\nsee the file named COPYING for details.\n"
-        "Written by the VideoLAN team; see the AUTHORS file.\n") );
+    fprintf( stdout, LICENSE_MSG );
 
 #ifdef WIN32        /* Pause the console because it's destroyed when we exit */
     PauseConsole();