- Also look in /var/lib/GeoIP/GeoIP.dat for GeoIP database (OpenSuse …

…11.2) * Thanks to Mariusz Fik for his report and patch
kylewooten · Dec 8, 2009 · ed1d75e · ed1d75e
1 parent 1e42003
commit ed1d75e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/configure b/configure
@@ -461,9 +461,9 @@ public:
  return true;
 #ifdef Q_WS_X11
  }
- if(QFile::exists("/usr/share/GeoIP/GeoIP.dat") || QFile::exists("/usr/local/share/GeoIP/GeoIP.dat"))
+ if(QFile::exists("/usr/share/GeoIP/GeoIP.dat") || QFile::exists("/usr/local/share/GeoIP/GeoIP.dat") || QFile::exists("/var/lib/GeoIP/GeoIP.dat"))
  return true;
- printf("\nWarning: GeoIP database was not found at /usr/share/GeoIP/GeoIP.dat\nCountry resolution will be slow.");
+ printf("\nWarning: GeoIP database was not found at /usr/share/GeoIP/GeoIP.dat or /var/lib/GeoIP/GeoIP.dat\nCountry resolution will be slow.");
  return false;
 #endif
  }

diff --git a/qcm/geoip-database.qcm b/qcm/geoip-database.qcm
@@ -20,9 +20,9 @@ public:
  return true;
 #ifdef Q_WS_X11
  }
- if(QFile::exists("/usr/share/GeoIP/GeoIP.dat") || QFile::exists("/usr/local/share/GeoIP/GeoIP.dat"))
+ if(QFile::exists("/usr/share/GeoIP/GeoIP.dat") || QFile::exists("/usr/local/share/GeoIP/GeoIP.dat") || QFile::exists("/var/lib/GeoIP/GeoIP.dat"))
  return true;
- printf("\nWarning: GeoIP database was not found at /usr/share/GeoIP/GeoIP.dat\nCountry resolution will be slow.");
+ printf("\nWarning: GeoIP database was not found at /usr/share/GeoIP/GeoIP.dat or /var/lib/GeoIP/GeoIP.dat\nCountry resolution will be slow.");
  return false;
 #endif
  }

diff --git a/src/geoip.h b/src/geoip.h
@@ -50,6 +50,8 @@ class GeoIP {
 #else
  if(QFile::exists("/usr/local/share/GeoIP/GeoIP.dat"))
  return "/usr/local/share/GeoIP/";
+ if(QFile::exists("/var/lib/GeoIP/GeoIP.dat"))
+ return "/var/lib/GeoIP/";
  return "/usr/share/GeoIP/";
 #endif
  }