Commit c1e7f608 authored by Tomas Touceda's avatar Tomas Touceda
Browse files

Merge branch 'bug4736_donotwarn_backport'

parents f329a00c 1feaf55b

changes/bug4736

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Add a hidden configuration option called SkipVersionCheck so

    systems like Tails can force Vidalia to skip checking tor's

    version. Resolves ticket 4736.
 
 No newline at end of file

src/vidalia/MainWindow.cpp

+3 −0
Original line number Diff line number Diff line
@@ -1662,6 +1662,9 @@ MainWindow::circuitEstablished() 
void

MainWindow::checkTorVersion()

{

  VidaliaSettings settings;

  if(settings.skipVersionCheck())

    return;

  QString status;

  if (_torControl->getInfo("status/version/current", status)) {

    if (!status.compare("old", Qt::CaseInsensitive)

src/vidalia/config/VidaliaSettings.cpp

+8 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define SETTING_LAST_UPDATE_CHECK   "LastUpdateCheck"

#define SETTING_USE_LOCAL_GEOIP_DATABASE  "UseLocalGeoIpDatabase"

#define SETTING_LOCAL_GEOIP_DATABASE "LocalGeoIpDatabase"

#define SETTING_SKIP_VERSION_CHECK  "SkipVersionCheck"



#if defined(Q_OS_WIN32)

#define STARTUP_REG_KEY        "Software\\Microsoft\\Windows\\CurrentVersion\\Run"
@@ -84,6 +85,7 @@ VidaliaSettings::VidaliaSettings() 
  setDefault(SETTING_USE_LOCAL_GEOIP_DATABASE, false);

  setDefault(SETTING_LOCAL_GEOIP_DATABASE, "");

  setDefault(SETTING_ICON_PREF, Both);

  setDefault(SETTING_SKIP_VERSION_CHECK, false);

}



/** Gets the currently preferred language code for Vidalia. */
@@ -355,3 +357,9 @@ VidaliaSettings::fromString(QString iconPref) 


  return Both;

}



bool

VidaliaSettings::skipVersionCheck() const

{

  return value(SETTING_SKIP_VERSION_CHECK).toBool();

}

src/vidalia/config/VidaliaSettings.h

+3 −0
Original line number Diff line number Diff line
@@ -139,6 +139,9 @@ public: 
  void setIconPref(const IconPosition iconPref);

  QString toString(const IconPosition iconPref);

  IconPosition fromString(QString iconPref);



  /** Returns true if Vidalia should skip the version check for tor */

  bool skipVersionCheck() const;

};



#endif