diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-03-06 15:29:34 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-03-07 00:16:54 +0000 |
| commit | e3c263c01236e7c31ec23f6c3d8750d7e92fb5a3 (patch) | |
| tree | 54fcc9a118fc5ecb29984bd213837902fcfb8e0c /ui | |
| parent | f0fb6ee50c953ac07eb76d47036a761a57f35491 (diff) | |
NSIS, WiX: Handle the presence or absence of mmdbresolve.
Only install mmdbresolve if MAXMINDDB_FOUND is true.
Fixup the Qt about box and WiX GTK defines while we're here.
Change-Id: I7ac3c21ddb4aebc1dae1c3d8cfd2bcafc4139d2e
Reviewed-on: https://code.wireshark.org/review/26299
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/about_dialog.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index 21449b9698..f36931f835 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -21,9 +21,9 @@ #ifdef HAVE_LIBSMI #include <epan/oids.h> #endif -#ifdef HAVE_GEOIP -#include <epan/geoip_db.h> -#endif + +#include <epan/maxmind_db.h> + #ifdef HAVE_LUA #include <epan/wslua/init_wslua.h> #endif @@ -248,12 +248,10 @@ FolderListModel::FolderListModel(QObject * parent): foreach(QString path, extPaths) appendRow( QStringList() << tr("Extcap path") << path.trimmed() << tr("Extcap Plugins search path")); -#ifdef HAVE_GEOIP - /* GeoIP */ - QStringList geoIpPaths = QString(geoip_db_get_paths()).split(G_SEARCHPATH_SEPARATOR_S); - foreach(QString path, geoIpPaths) - appendRow( QStringList() << tr("GeoIP path") << path.trimmed() << tr("GeoIP database search path")); -#endif + /* MaxMind DB */ + QStringList maxMindDbPaths = QString(maxmind_db_get_paths()).split(G_SEARCHPATH_SEPARATOR_S); + foreach(QString path, maxMindDbPaths) + appendRow( QStringList() << tr("MaxMind DB path") << path.trimmed() << tr("MaxMind DB database search path")); #ifdef HAVE_LIBSMI /* SMI MIBs/PIBs */ |