diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/about_dlg.c | 4 | ||||
| -rw-r--r-- | gtk/hostlist_table.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c index 25c7651308..65212ee578 100644 --- a/gtk/about_dlg.c +++ b/gtk/about_dlg.c @@ -36,7 +36,7 @@ #include <epan/oids.h> #endif #ifdef HAVE_GEOIP -#include <epan/geoip.h> +#include <epan/geoip_db.h> #endif #include "../globals.h" @@ -430,7 +430,7 @@ about_folders_page_new(void) #ifdef HAVE_GEOIP /* GeoIP */ - path = geoip_get_paths(); + path = geoip_db_get_paths(); #ifdef _WIN32 resultArray = g_strsplit(path, ";", 10); diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c index bfb5046011..96cccad773 100644 --- a/gtk/hostlist_table.c +++ b/gtk/hostlist_table.c @@ -40,7 +40,7 @@ #include <epan/tap.h> #include <epan/strutil.h> #ifdef HAVE_GEOIP -#include <epan/geoip.h> +#include <epan/geoip_db.h> #endif #include "../simple_dialog.h" @@ -1108,7 +1108,7 @@ add_hostlist_table_data(hostlist_table *hl, const address *addr, guint32 port, g /* Filled in from the GeoIP config, if any */ for (i = 0; i < NUM_GEOIP_COLS; i++) { if (i < geoip_num_dbs() && talker->address.type == AT_IPv4) { - const guchar *name = geoip_db_lookup_ipv4(i, *(guint32*)talker->address.data); + const guchar *name = geoip_db_lookup_ipv4(i, *(guint32*)talker->address.data, "-"); g_snprintf(geoip[i], COL_STR_LEN, "%s", format_text (name, strlen(name))); entries[NUM_BUILTIN_COLS + i] = geoip[i]; gtk_clist_set_column_visibility(hl->table, NUM_BUILTIN_COLS + i, TRUE); |