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, 10 insertions, 10 deletions

diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index 094b482b49..6b54f99f5b 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -540,16 +540,6 @@ int main(int argc, char *argv[])
 
     init_open_routines();
 
-    /* Register all dissectors; we must do this before checking for the
-       "-G" flag, as the "-G" flag dumps information registered by the
-       dissectors, and we must do it before we read the preferences, in
-       case any dissectors register preferences. */
-    if (!epan_init(register_all_protocols,register_all_protocol_handoffs,
-                   splash_update, NULL)) {
-        SimpleDialog::displayQueuedMessages(main_w);
-        return 2;
-    }
-
 #ifdef HAVE_PLUGINS
     /* Register all the plugin types we have. */
     epan_register_plugin_types(); /* Types known to libwireshark */
@@ -567,6 +557,16 @@ int main(int argc, char *argv[])
     register_all_codecs();
 #endif
 
+    /* Register all dissectors; we must do this before checking for the
+       "-G" flag, as the "-G" flag dumps information registered by the
+       dissectors, and we must do it before we read the preferences, in
+       case any dissectors register preferences. */
+    if (!epan_init(register_all_protocols,register_all_protocol_handoffs,
+                   splash_update, NULL)) {
+        SimpleDialog::displayQueuedMessages(main_w);
+        return 2;
+    }
+
     splash_update(RA_LISTENERS, NULL, NULL);
 
     /* Register all tap listeners; we do this before we parse the arguments,