diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-12-31 20:14:08 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-01 04:15:29 +0000 |
| commit | ee9f102aa9ec36b28992512d840f971be4eba571 (patch) | |
| tree | 8251e2c26ba9f6c3680633a03901dd386c3d349d /ui/win32/file_dlg_win32.c | |
| parent | 93f9416c3660b87896e8b59a4d952fb851002bb5 (diff) | |
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@alum.mit.edu>
Diffstat (limited to 'ui/win32/file_dlg_win32.c')
| -rw-r--r-- | ui/win32/file_dlg_win32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index 747819024b..3b8c0614df 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -978,7 +978,7 @@ win32_import_color_file(HWND h_wnd, gpointer color_filters) { /* XXX - Support export limited to selected filters */ if (GetOpenFileName(ofn)) { g_free( (void *) ofn); - if (!color_filters_import(utf_16to8(file_name), color_filters, &err_msg, initialize_color, color_filter_add_cb)) { + if (!color_filters_import(utf_16to8(file_name), color_filters, &err_msg, color_filter_add_cb)) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_msg); g_free(err_msg); return; |