diff options
Diffstat (limited to 'source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff')
| -rw-r--r-- | source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff b/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff index 2a944c10c..cf6d114c7 100644 --- a/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff +++ b/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff @@ -1,6 +1,6 @@ ---- ./plugins/infowidget/geoipmanager.cpp.orig 2020-12-11 11:37:19.450009584 -0600 -+++ ./plugins/infowidget/geoipmanager.cpp 2020-12-11 11:39:48.834012926 -0600 -@@ -42,7 +42,7 @@ +--- ./plugins/infowidget/geoipmanager.cpp.orig 2021-04-14 10:30:03.000000000 -0500 ++++ ./plugins/infowidget/geoipmanager.cpp 2021-04-22 14:25:11.954202268 -0500 +@@ -45,7 +45,7 @@ #ifdef USE_SYSTEM_GEOIP geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD); #else @@ -9,7 +9,7 @@ if (geoip_data_file.isEmpty()) geoip_data_file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("GeoIP.dat")); -@@ -53,11 +53,6 @@ +@@ -56,11 +56,6 @@ if (geo_ip) { QFileInfo fi(geoip_data_file); QDateTime now = QDateTime::currentDateTime(); @@ -21,16 +21,16 @@ } } #endif -@@ -101,12 +96,6 @@ +@@ -104,12 +99,6 @@ void GeoIPManager::downloadDataBase() { -#ifndef USE_SYSTEM_GEOIP - Out(SYS_INW | LOG_NOTICE) << "Downloading GeoIP database: " << geoip_url << endl; - download_destination = kt::DataDir(CreateIfNotExists) + geoip_url.fileName(); -- KIO::CopyJob* job = KIO::copy(geoip_url, QUrl::fromLocalFile(download_destination), KIO::Overwrite | KIO::HideProgressInfo); +- KIO::CopyJob *job = KIO::copy(geoip_url, QUrl::fromLocalFile(download_destination), KIO::Overwrite | KIO::HideProgressInfo); - connect(job, &KIO::CopyJob::result, this, &GeoIPManager::databaseDownloadFinished); -#endif } - void GeoIPManager::databaseDownloadFinished(KJob* job) + void GeoIPManager::databaseDownloadFinished(KJob *job) |