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 /ui/win32 | |
| 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 'ui/win32')
| -rw-r--r-- | ui/win32/file_dlg_win32.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index 9e9c32d6c5..747819024b 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -41,7 +41,7 @@ #include "epan/addr_resolv.h" #include "epan/prefs.h" -#include "color_filters.h" +#include "epan/color_filters.h" #include "ui/alert_box.h" #include "ui/help_url.h" @@ -49,6 +49,7 @@ #include "ui/simple_dialog.h" #include "ui/ssl_key_export.h" #include "ui/util.h" +#include "ui/ui_util.h" #include "file_dlg_win32.h" @@ -898,6 +899,7 @@ win32_export_color_file(HWND h_wnd, capture_file *cf, gpointer filter_list) { TCHAR file_name[MAX_PATH] = _T(""); gchar *dirname; int ofnsize; + gchar *err_msg = NULL; ofnsize = win32_get_ofnsize(); ofn = g_malloc0(ofnsize); @@ -927,8 +929,12 @@ win32_export_color_file(HWND h_wnd, capture_file *cf, gpointer filter_list) { /* XXX - Support marked filters */ if (GetSaveFileName(ofn)) { g_free( (void *) ofn); - if (!color_filters_export(utf_16to8(file_name), filter_list, FALSE /* all filters */)) + if (!color_filters_export(utf_16to8(file_name), filter_list, FALSE /* all filters */, &err_msg)) + { + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_msg); + g_free(err_msg); return; + } /* Save the directory name for future file dialogs. */ dirname = get_dirname(utf_16to8(file_name)); /* Overwrites cf_name */ @@ -944,6 +950,7 @@ win32_import_color_file(HWND h_wnd, gpointer color_filters) { TCHAR file_name[MAX_PATH] = _T(""); gchar *dirname; int ofnsize; + gchar *err_msg = NULL; ofnsize = win32_get_ofnsize(); ofn = g_malloc0(ofnsize); @@ -971,8 +978,11 @@ 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)) + if (!color_filters_import(utf_16to8(file_name), color_filters, &err_msg, initialize_color, color_filter_add_cb)) { + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_msg); + g_free(err_msg); return; + } /* Save the directory name for future file dialogs. */ dirname = get_dirname(utf_16to8(file_name)); /* Overwrites cf_name */ |