aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/main.cpp
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-07-23 13:38:55 -0400
committerGerald Combs <gerald@wireshark.org>2014-07-26 20:59:42 +0000
commit31ecdf5b06bff3bb2e706e840c28c519698e6f67 (patch)
tree71b3e59889e862560412d317df71113f66b094b6 /ui/qt/main.cpp
parent507d07eda6ad562d4567cf0ee83aa9b03997beca (diff)
Refactor "common" Conversation table functionality.
Refactor (non-GUI) conversation table functionality from gtk/Qt to epan. Also refactor "common GUI" conversation table functionality. The idea is to not have to modify the GUI when a dissector adds a new "conversation type" Change-Id: I11f08d0d7edd631218663ba4b902c4a4c849acda Reviewed-on: https://code.wireshark.org/review/3113 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/main.cpp')
-rw-r--r--ui/qt/main.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index 7ec385ddf1..8bc06c7265 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -76,6 +76,7 @@
#include <epan/uat.h>
#include <epan/column.h>
#include <epan/disabled_protos.h>
+#include <epan/conversation_table.h>
#include <epan/print.h>
#ifdef HAVE_PLUGINS
@@ -141,6 +142,7 @@
#include <qtranslator.h>
#include <qlocale.h>
#include <qlibraryinfo.h>
+#include "conversation_dialog.h"
#ifdef HAVE_LIBPCAP
capture_options global_capture_opts;
@@ -908,6 +910,7 @@ int main(int argc, char *argv[])
#endif
register_all_tap_listeners();
+ conversation_table_set_gui_info(init_conversation_table);
if (ex_opt_count("read_format") > 0) {
in_file_type = open_info_name_to_type(ex_opt_get_next("read_format"));