github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-19 12:59:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source 
* Thanks to Mariusz Fik for his report and patch
This commit is contained in:
Christophe Dumez 2009-12-08 07:55:08 +00:00
commit ed1d75ecb1
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
configure vendored
View file

@ -461,9 +461,9 @@ public:
return true; return true;
#ifdef Q_WS_X11 #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; 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; return false;
#endif #endif
} }

4
qcm/geoip-database.qcm
View file

@ -20,9 +20,9 @@ public:
return true; return true;
#ifdef Q_WS_X11 #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; 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; return false;
#endif #endif
} }

2
src/geoip.h
View file

@ -50,6 +50,8 @@ protected:
#else #else
if(QFile::exists("/usr/local/share/GeoIP/GeoIP.dat")) if(QFile::exists("/usr/local/share/GeoIP/GeoIP.dat"))
return "/usr/local/share/GeoIP/"; return "/usr/local/share/GeoIP/";
if(QFile::exists("/var/lib/GeoIP/GeoIP.dat"))
return "/var/lib/GeoIP/";
return "/usr/share/GeoIP/"; return "/usr/share/GeoIP/";
#endif #endif
} }