Merge branch 'master' of git@git.videolan.org:vlc

[vlc] / modules / gui / qt4 / dialogs / help.cpp

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 4f337214bae6d6d07f77751e9f6a9f9e64973bf8..24b28208ce75a6a88cce6f72cefc6010bf6aeb0a 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "dialogs/help.hpp"
 #include <vlc_about.h>
@@ -99,7 +99,7 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf)
     closeButton->setDefault( true );
 
     QLabel *introduction = new QLabel(
-            qtr( "VLC media player " VERSION_MESSAGE ) );
+            qtr( "VLC media player" " " VERSION_MESSAGE ) );
     QLabel *iconVLC = new QLabel;
     if( QDate::currentDate().dayOfYear() >= 354 )
         iconVLC->setPixmap( QPixmap( ":/vlc48-christmas.png" ) );
@@ -124,7 +124,7 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf)
             + "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 " by the VideoLAN Team.\n" )
+            + qtr( "Copyright (C) " COPYRIGHT_YEARS " by the VideoLAN Team.\n" )
             + "vlc@videolan.org, http://www.videolan.org" );
     infoLabel->setWordWrap( infoLabel );
 
@@ -257,7 +257,7 @@ void UpdateDialog::UpdateOrDownload()
         updateButton->setEnabled( false );
         QString dest_dir = QFileDialog::getExistingDirectory( this,
                                  qtr( "Select a directory ..." ),
-                                 qfu( p_update->p_libvlc->psz_homedir ) );
+                                 qfu( config_GetHomeDir() ) );
 
         if( dest_dir != "" )
         {
@@ -284,12 +284,17 @@ void UpdateDialog::updateNotify( bool b_result )
     /* The update finish without errors */
     if( b_result )
     {
-        if( update_CompareReleaseToCurrent( p_update ) == UpdateReleaseStatusNewer )
+        if( update_NeedUpgrade( p_update ) )
         {
+            update_release_t *p_release = update_GetRelease( p_update );
+            assert( p_release );
             b_checked = true;
             updateButton->setText( "Download" );
             updateLabel->setText( qtr( "There is a new version of VLC :\n" )
-                                + qfu( p_update->release.psz_desc )  );
+                                + qfu( p_release->psz_desc )  );
+
+            /* Force the dialog to be shown */
+            this->show();
         }
         else
             updateLabel->setText( qtr( "You have the latest version of VLC" ) );