From ee9f102aa9ec36b28992512d840f971be4eba571 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 31 Dec 2015 20:14:08 -0800 Subject: 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 --- wireshark-qt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wireshark-qt.cpp') diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index c1382c967c..bd9277f0f7 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -1354,7 +1354,7 @@ int main(int argc, char *argv[]) //////// gchar* err_msg = NULL; - if (!color_filters_init(&err_msg, initialize_color, color_filter_add_cb)) { + if (!color_filters_init(&err_msg, color_filter_add_cb)) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_msg); g_free(err_msg); } -- cgit v1.2.3