diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-12-22 15:07:00 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-28 18:33:41 +0000 |
| commit | 5e4bbcda9839d9fd4480db8c4f9386ff388d166c (patch) | |
| tree | 9801cea61222e0e9e3f8c57f4574ddb6bab075c7 /wireshark-qt.cpp | |
| parent | c752daf4b8816d809a92894155ce8de1b24613c7 (diff) | |
Refactor GUI dependencies out of color_filters.[ch] and move it to epan directory.
This also moved color.h into color_filters.h
Change-Id: Ic19e27aa1b3ec67e764aa7ee8bbef7b1187bb12e
Reviewed-on: https://code.wireshark.org/review/12831
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'wireshark-qt.cpp')
| -rw-r--r-- | wireshark-qt.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index ec8b33cbab..cd63039447 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -72,8 +72,7 @@ /* general (not Qt specific) */ #include "file.h" -#include "color.h" -#include "color_filters.h" +#include "epan/color_filters.h" #include "log.h" #include "epan/rtd_table.h" @@ -89,6 +88,8 @@ #include "ui/util.h" #include "ui/qt/conversation_dialog.h" +#include "ui/qt/color_utils.h" +#include "ui/qt/coloring_rules_dialog.h" #include "ui/qt/endpoint_dialog.h" #include "ui/qt/main_window.h" #include "ui/qt/response_time_delay_dialog.h" @@ -1341,16 +1342,20 @@ int main(int argc, char *argv[]) g_free(rf_path); } - color_filters_enable(recent.packet_list_colorize); + packet_list_enable_color(recent.packet_list_colorize); g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: fetch recent color settings"); - color_filters_enable(TRUE); + packet_list_enable_color(TRUE); //////// //////// - color_filters_init(); + gchar* err_msg = NULL; + if (!color_filters_init(&err_msg, initialize_color, color_filter_add_cb)) { + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_msg); + g_free(err_msg); + } //////// |