diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2017-02-15 16:46:05 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-02-15 20:37:38 +0000 |
| commit | 0f5948015d96fdb198fb4b26a810404b1225462c (patch) | |
| tree | e08f36b37d0b9633d59b05acd47ec1062b836190 /filter_files.c | |
| parent | 0b8a12fd51c3d9fde677b42bc37db49e61669abd (diff) | |
ifdef g_list_free_full it requires glib 2.28
Change-Id: I390d602c6caaa5daa2928dcd37f5f476195a685f
Reviewed-on: https://code.wireshark.org/review/20118
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'filter_files.c')
| -rw-r--r-- | filter_files.c | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/filter_files.c b/filter_files.c index d48500f000..d518ff49bf 100644 --- a/filter_files.c +++ b/filter_files.c @@ -102,20 +102,40 @@ free_filter_entry(gpointer data) void free_filter_lists(void) { if (capture_filters) { +#if GLIB_CHECK_VERSION(2, 28, 0) g_list_free_full(capture_filters, free_filter_entry); +#else + g_list_foreach(capture_filters, (GFunc)free_filter_entry, NULL); + g_list_free(capture_filters); +#endif capture_filters = NULL; } if (display_filters) { +#if GLIB_CHECK_VERSION(2, 28, 0) g_list_free_full(display_filters, free_filter_entry); - display_filters = NULL; +#else + g_list_foreach(display_filters, (GFunc)free_filter_entry, NULL); + g_list_free(display_filters); +#endif + display_filters = NULL; } if (capture_edited_filters) { - g_list_free_full(capture_edited_filters, free_filter_entry); - capture_edited_filters = NULL; +#if GLIB_CHECK_VERSION(2, 28, 0) + g_list_free_full(capture_edited_filters, free_filter_entry); +#else + g_list_foreach(capture_edited_filters, (GFunc)free_filter_entry, NULL); + g_list_free(capture_edited_filters); +#endif + capture_edited_filters = NULL; } if (display_edited_filters) { - g_list_free_full(display_edited_filters, free_filter_entry); - display_edited_filters = NULL; +#if GLIB_CHECK_VERSION(2, 28, 0) + g_list_free_full(display_edited_filters, free_filter_entry); +#else + g_list_foreach(display_edited_filters, (GFunc)free_filter_entry, NULL); + g_list_free(display_edited_filters); +#endif + display_edited_filters = NULL; } } |