[vidalia-svn] r4375: Add UseLocalGeoIPDatabase and LocalGeoIPDatabase vidalia.con (vidalia/trunk/src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2010-08-05 16:09:44 -0400 (Thu, 05 Aug 2010)
New Revision: 4375

Modified:
   vidalia/trunk/src/vidalia/config/VidaliaSettings.cpp
   vidalia/trunk/src/vidalia/config/VidaliaSettings.h
Log:

Add UseLocalGeoIPDatabase and LocalGeoIPDatabase vidalia.conf options to
enable using a local database for GeoIP lookups.


Modified: vidalia/trunk/src/vidalia/config/VidaliaSettings.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/VidaliaSettings.cpp	2010-08-05 20:05:41 UTC (rev 4374)
+++ vidalia/trunk/src/vidalia/config/VidaliaSettings.cpp	2010-08-05 20:09:44 UTC (rev 4375)
@@ -38,6 +38,8 @@
 #define SETTING_PROXY_EXECUTABLE_ARGUMENTS  "ProxyExecutableArguments"
 #define SETTING_CHECK_FOR_UPDATES   "CheckForUpdates"
 #define SETTING_LAST_UPDATE_CHECK   "LastUpdateCheck"
+#define SETTING_USE_LOCAL_GEOIP_DATABASE  "UseLocalGeoIpDatabase"
+#define SETTING_LOCAL_GEOIP_DATABASE "LocalGeoIpDatabase"
 
 #if defined(Q_OS_WIN32)
 #define STARTUP_REG_KEY        "Software\\Microsoft\\Windows\\CurrentVersion\\Run"
@@ -79,6 +81,8 @@
   setDefault(SETTING_CHECK_FOR_UPDATES, false);
 #endif
   setDefault(SETTING_LAST_UPDATE_CHECK, QDateTime());
+  setDefault(SETTING_USE_LOCAL_GEOIP_DATABASE, false);
+  setDefault(SETTING_LOCAL_GEOIP_DATABASE, "");
 }
 
 /** Gets the currently preferred language code for Vidalia. */
@@ -294,3 +298,27 @@
   setValue(SETTING_LAST_UPDATE_CHECK, checkedAt);
 }
 
+bool
+VidaliaSettings::useLocalGeoIpDatabase() const
+{
+  return value(SETTING_USE_LOCAL_GEOIP_DATABASE).toBool();
+}
+
+void
+VidaliaSettings::setUseLocalGeoIpDatabase(bool enabled)
+{
+  setValue(SETTING_USE_LOCAL_GEOIP_DATABASE, enabled);
+}
+
+QString
+VidaliaSettings::localGeoIpDatabase() const
+{
+  return QDir::convertSeparators(value(SETTING_LOCAL_GEOIP_DATABASE).toString());
+}
+
+void
+VidaliaSettings::setLocalGeoIpDatabase(const QString &databaseFile)
+{
+  setValue(SETTING_LOCAL_GEOIP_DATABASE, databaseFile);
+}
+

Modified: vidalia/trunk/src/vidalia/config/VidaliaSettings.h
===================================================================
--- vidalia/trunk/src/vidalia/config/VidaliaSettings.h	2010-08-05 20:05:41 UTC (rev 4374)
+++ vidalia/trunk/src/vidalia/config/VidaliaSettings.h	2010-08-05 20:09:44 UTC (rev 4375)
@@ -115,6 +115,17 @@
   /** Sets to <b>checkedAt</b> the time at which Vidalia last checked for
    * available software updates. */
   void setLastCheckedForUpdates(const QDateTime &checkedAt);
+
+  /** Returns true if Vidalia is currently configured to use a local GeoIP
+   * database. */
+  bool useLocalGeoIpDatabase() const;
+  /** Enables or disables use of a local GeoIP database. */
+  void setUseLocalGeoIpDatabase(bool enabled);
+
+  /** Returns the file, if set, to be used as the local GeoIP database. */
+  QString localGeoIpDatabase() const;
+  /** Sets the file to use as a local GeoIP database. */
+  void setLocalGeoIpDatabase(const QString &databaseFile);
 };
 
 #endif