diff options
Diffstat (limited to 'ui/gtk/main.c')
| -rw-r--r-- | ui/gtk/main.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 72739e55b3..6affd20ea1 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -76,7 +76,6 @@ #include <epan/disabled_protos.h> #include <epan/epan.h> #include <epan/epan_dissect.h> -#include <epan/plugins.h> #include <epan/dfilter/dfilter.h> #include <epan/strutil.h> #include <epan/emem.h> @@ -92,6 +91,8 @@ #include <epan/print.h> #include <epan/timestamp.h> +#include <wsutil/plugins.h> + /* general (not GTK specific) */ #include "../file.h" #include "../frame_tvbuff.h" @@ -124,6 +125,8 @@ #include "ui/iface_lists.h" #endif +#include "codecs/codecs.h" + #ifdef HAVE_LIBPCAP #include "capture_ui_utils.h" #include "capture-pcap-util.h" @@ -2518,6 +2521,23 @@ main(int argc, char *argv[]) g_free(init_progfile_dir_error); } +#ifdef HAVE_PLUGINS + /* Register all the plugin types we have. */ + epan_register_plugin_types(); /* Types known to libwireshark */ + wtap_register_plugin_types(); /* Types known to libwiretap */ + codec_register_plugin_types(); /* Types known to libcodec */ + + /* Scan for plugins. This does *not* call their registration routines; + that's done later. */ + scan_plugins(); + + /* Register all libwiretap plugin modules. */ + register_all_wiretap_modules(); + + /* Register all audio codec plugins. */ + register_all_codecs(); +#endif + splash_update(RA_DISSECTORS, NULL, (gpointer)splash_win); /* Register all dissectors; we must do this before checking for the |