Revert "tap: change glib functions to wmem."

This reverts commit 2e9f3c5d366eaa7139fc877b5301392166b3f985.

It breaks the registration of codec, dissector and libwiretap plugins.

Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de
Reviewed-on: https://code.wireshark.org/review/16012
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/tshark.c b/tshark.c
index 3df60d4dd5..af38ab0702 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1196,8 +1196,14 @@ main(int argc, char *argv[])
   init_open_routines();
 
 #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 */
 
+  /* 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();
 #endif