diff options
author | Dario Lombardo <lomato@gmail.com> | 2016-05-03 18:40:17 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2016-06-17 15:38:03 +0000 |
commit | 2e9f3c5d366eaa7139fc877b5301392166b3f985 (patch) | |
tree | ac2d04b7cc1b8d6c8962d437584e351fcf1bf450 /wireshark-qt.cpp | |
parent | 2aa55a387a87cd4f740aea661ca1ca535cd2e392 (diff) |
tap: change glib functions to wmem.
Change-Id: I878ae6b121a669f9b7f4e1e57bc079f0cb44c0bf
Reviewed-on: https://code.wireshark.org/review/15270
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wireshark-qt.cpp')
-rw-r--r-- | wireshark-qt.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index c549f0f169..1e286f5cbb 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -775,6 +775,16 @@ 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 */ @@ -792,16 +802,6 @@ 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, |