[pitivi/1.0] mainwindow: Fix incorrect version number in the About dialog

[Alexandru Băluț <alexbalut src gnome org>]

commit b0e947b3b1d0f4e7f4c7b5270a72767889e17026
Author: Alexandru Băluț <alexandru balut gmail com>
Date:   Thu Sep 21 09:07:27 2017 +0200

    mainwindow: Fix incorrect version number in the About dialog
    
    If the Pitivi package is built (with Meson) while in some
    non-Pitivi git repository, the HEAD sha was being displayed.

 pitivi/mainwindow.py |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/pitivi/mainwindow.py b/pitivi/mainwindow.py
index 95f9640..2ffe723 100644
--- a/pitivi/mainwindow.py
+++ b/pitivi/mainwindow.py
@@ -602,14 +602,14 @@ class MainWindow(Gtk.ApplicationWindow, Loggable):
 
         if in_devel():
             version_str = _("Development version: %s") % GITVERSION
-        elif not self.app.isLatest():
-            version_str = _("Version %(cur_ver)s — %(new_ver)s is available") % \
-                {"cur_ver": GITVERSION,
-                 "new_ver": self.app.getLatest()}
-        elif GITVERSION:
-            version_str = _("Version %s") % GITVERSION
         else:
-            version_str = _("Version %s") % VERSION
+            version = GITVERSION if GITVERSION.startswith(VERSION) else VERSION
+            if not self.app.isLatest():
+                version_str = _("Version %(cur_ver)s — %(new_ver)s is available") % \
+                    {"cur_ver": version,
+                     "new_ver": self.app.getLatest()}
+            else:
+                version_str = _("Version %s") % version
         abt.set_version(version_str)
 
         comments = ["",