diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-07-08 01:17:19 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-07-08 01:17:19 +0000 |
| commit | 10fa9baef2424463deeb5d15e4d19970ba2fe67f (patch) | |
| tree | 749418214a6fea4438fafaf7b9047167f4f7482f /epan/epan.c | |
| parent | 659cf0527ae9e16da3670e224f22b942b0c0a4a3 (diff) | |
From Evan Huus:
Don't initialize GeoIP from epan_init(), as we probably haven't loaded the
preferences for it yet (thanks to it's new use of the UAT framework).
Instead, register a post_update callback with UAT and load it there. As a
bonus, this also means that applying GeoIP preferences no longer requires
restarting Wireshark - everything should Just Work with the new databases right
away.
Fixes bug 7446.
svn path=/trunk/; revision=43604
Diffstat (limited to 'epan/epan.c')
| -rw-r--r-- | epan/epan.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/epan/epan.c b/epan/epan.c index 11c4b98d6b..28b583a218 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -120,10 +120,6 @@ epan_init(void (*register_all_protocols_func)(register_cb cb, gpointer client_da #ifdef HAVE_LUA wslua_init(cb, client_data); #endif -#ifdef HAVE_GEOIP - geoip_db_init(); -#endif - } void |