URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ee9f102aa9ec36b28992512d840f971be4eba571
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
ee9f102 by Guy Harris (guy@xxxxxxxxxxxx):
No need for toolkit-dependent color initialization.
We're not allocating colors ourselves in GTK+ (and haven't been doing so
since at least 1.12), and all color_t values are valid colors, so
we don't need any toolkit-specific processing to fill in a color_t.
While we're at it, catch read errors when reading color filter files.
Change-Id: Ieb520d141cf15e371a31a01459d466c95ba2209b
Reviewed-on: https://code.wireshark.org/review/12985
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from 93f9416 Get rid of the "pixel" member of a color_t.
adds ee9f102 No need for toolkit-dependent color initialization.
Summary of changes:
epan/color_filters.c | 111 ++++++++++++++++++++++-----------------
epan/color_filters.h | 19 ++-----
epan/prefs.c | 4 ++
ui/gtk/capture_file_dlg.c | 2 +-
ui/gtk/color_dlg.c | 2 +-
ui/gtk/color_utils.c | 22 +-------
ui/gtk/color_utils.h | 34 ++++++++++--
ui/gtk/main.c | 6 +--
ui/qt/color_utils.cpp | 15 ++++++
ui/qt/coloring_rules_dialog.cpp | 23 +-------
ui/qt/main_window_slots.cpp | 2 +-
ui/qt/wireshark_application.cpp | 2 +-
ui/ui_util.h | 1 -
ui/win32/file_dlg_win32.c | 2 +-
wireshark-qt.cpp | 2 +-
15 files changed, 127 insertions(+), 120 deletions(-)