diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/epan.c | 6 | ||||
| -rw-r--r-- | epan/epan.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/epan/epan.c b/epan/epan.c index ed6373e6e0..f590a0529c 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -176,7 +176,7 @@ void epan_register_plugin(const epan_plugin *plug) #endif gboolean -epan_init(register_cb cb, gpointer client_data) +epan_init(register_cb cb, gpointer client_data, gboolean load_plugins) { volatile gboolean status = TRUE; @@ -198,9 +198,11 @@ epan_init(register_cb cb, gpointer client_data) except_init(); + if (load_plugins) { #ifdef HAVE_PLUGINS - libwireshark_plugins = plugins_init(WS_PLUGIN_EPAN); + libwireshark_plugins = plugins_init(WS_PLUGIN_EPAN); #endif + } /* initialize libgcrypt (beware, it won't be thread-safe) */ gcry_check_version(NULL); diff --git a/epan/epan.h b/epan/epan.h index e29fb83903..80d9b6f4e4 100644 --- a/epan/epan.h +++ b/epan/epan.h @@ -100,7 +100,7 @@ Ref2 for further edits - delete when done * Returns TRUE on success, FALSE on failure. */ WS_DLL_PUBLIC -gboolean epan_init(register_cb cb, void *client_data); +gboolean epan_init(register_cb cb, void *client_data, gboolean load_plugins); /** * Load all settings, from the current profile, that affect epan. |