From cf0c77c625b58b5a03f21b18754f596e353bf294 Mon Sep 17 00:00:00 2001
From: Debian GPS team <gpsbabel@packages.debian.org>
Date: Sat, 21 Dec 2019 23:27:08 +0000
Subject: [PATCH] gpsbabelfe_do-not-check-for-newer-version

Disable check for newer versions on start.


Gbp-Pq: Name gpsbabelfe_do-not-check-for-newer-version
---
 gui/babeldata.h    |  2 +-
 gui/mainwindow.cc  | 17 -----------------
 gui/mainwinui.ui   |  6 ------
 gui/preferences.cc |  2 --
 gui/preferences.ui |  7 -------
 5 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/gui/babeldata.h b/gui/babeldata.h
index 50f3128..79a663c 100644
--- a/gui/babeldata.h
+++ b/gui/babeldata.h
@@ -64,7 +64,7 @@ public:
     upgradeErrors_(0),
     upgradeOffers_(0),
     runCount_(0),
-    startupVersionCheck_(true),
+    startupVersionCheck_(false),
     reportStatistics_(false),
     allowBetaUpgrades_(false),
     ignoreVersionMismatch_(true),
diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
index ea995ad..a3865a7 100644
--- a/gui/mainwindow.cc
+++ b/gui/mainwindow.cc
@@ -174,7 +174,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
   connect(ui_.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX()));
   connect(ui_.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX()));
   connect(ui_.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX()));
-  connect(ui_.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX()));
   connect(ui_.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX()));
 
   connect(ui_.inputFormatCombo,  SIGNAL(currentIndexChanged(int)),
@@ -234,19 +233,7 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
 
   //--- Restore from registry
   restoreSettings();
-
   upgrade = new UpgradeCheck(parent, formatList_, babelData_);
-  if (babelData_.startupVersionCheck_) {
-    upgrade->checkForUpgrade(babelVersion_, babelData_.upgradeCheckTime_,
-                             allowBetaUpgrades());
-  }
-
-  if (!babelData_.ignoreVersionMismatch_ && babelVersion_ != VERSION) {
-    VersionMismatch vm(nullptr, babelVersion_, QString(VERSION));
-
-    vm.exec();
-    babelData_.ignoreVersionMismatch_ = vm.neverAgain();
-  }
 }
 
 //------------------------------------------------------------------------
@@ -1072,10 +1059,6 @@ void MainWindow::applyActionX()
 //------------------------------------------------------------------------
 void MainWindow::closeActionX()
 {
-  QDateTime wt= upgrade->getUpgradeWarningTime();
-  if (wt.isValid()) {
-    babelData_.upgradeCheckTime_ = wt;
-  }
   babelData_.runCount_++;
 
   QDateTime now = QDateTime::currentDateTime();
diff --git a/gui/mainwinui.ui b/gui/mainwinui.ui
index fdac6bd..bb8d092 100644
--- a/gui/mainwinui.ui
+++ b/gui/mainwinui.ui
@@ -637,7 +637,6 @@
     <addaction name="actionHelp"/>
     <addaction name="separator"/>
     <addaction name="actionAbout"/>
-    <addaction name="actionUpgradeCheck"/>
     <addaction name="separator"/>
     <addaction name="actionVisit_Website"/>
     <addaction name="actionMake_a_Donation"/>
@@ -666,11 +665,6 @@
     <string>Preferences...</string>
    </property>
   </action>
-  <action name="actionUpgradeCheck">
-   <property name="text">
-    <string>Check for Upgrade</string>
-   </property>
-  </action>
   <action name="actionVisit_Website">
    <property name="text">
     <string>Visit Website...</string>
diff --git a/gui/preferences.cc b/gui/preferences.cc
index b6137c8..96d0549 100644
--- a/gui/preferences.cc
+++ b/gui/preferences.cc
@@ -41,7 +41,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
 {
   ui_.setupUi(this);
 
-  ui_.startupCheck->setChecked(babelData_.startupVersionCheck_);
   ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
   // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
   if (VERSION == QString("1.4.1")) {
@@ -84,7 +83,6 @@ void Preferences::acceptClicked()
     formatList_[i].setHidden(item->checkState() == Qt::Unchecked);
   }
 
-  babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked();
   babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
   accept();
 }
diff --git a/gui/preferences.ui b/gui/preferences.ui
index ac671d7..d0b1f72 100644
--- a/gui/preferences.ui
+++ b/gui/preferences.ui
@@ -39,13 +39,6 @@
         </rect>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_4">
-        <item>
-         <widget class="QCheckBox" name="startupCheck">
-          <property name="text">
-           <string>Check for newer version on start.</string>
-          </property>
-         </widget>
-        </item>
         <item>
          <widget class="QCheckBox" name="reportStatisticsCheck">
           <property name="text">
-- 
2.30.2