SHA256
1
0
forked from pool/ktorrent
ktorrent/no-geoip-db.diff

35 lines
1.1 KiB
Diff

--- plugins/infowidget/peerviewmodel.cpp 2008/03/25 12:17:35 1.1
+++ plugins/infowidget/peerviewmodel.cpp 2008/03/25 12:18:16
@@ -40,7 +40,7 @@
static bool icons_loaded = false;
static GeoIP* geo_ip = 0;
static FlagDB flagDB(22, 18);
- static bool geoip_db_exists = true;
+ static bool geoip_db_exists = false;
static QString geoip_data_file;
@@ -54,10 +54,9 @@
icons_loaded = true;
flagDB.addFlagSource("data", QString("ktorrent/%1.png"));
flagDB.addFlagSource("locale", QString("l10n/%1/flag.png"));
-#ifdef USE_SYSTEM_GEOIP
+#if 0
geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD);
geoip_db_exists = (geo_ip != NULL);
-#else
geoip_db_exists = !KStandardDirs::locate("data", "ktorrent/geoip.dat").isNull();
if(geoip_db_exists)
{
--- plugins/infowidget/CMakeLists.txt 2008/02/19 10:52:14 1.1
+++ plugins/infowidget/CMakeLists.txt 2008/02/19 10:55:36
@@ -25,8 +25,6 @@
set(geoip_src GeoIP.c)
endif(WITH_SYSTEM_GEOIP)
-add_subdirectory(geoip)
-
set(ktinfowidgetplugin_SRC
infowidgetplugin.cpp
iwprefpage.cpp