diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2014-06-27 12:00:11 +0200 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2014-06-27 10:37:07 +0000 |
| commit | d894c2e1e0ebe564ac8d9a6ee4a4d75b1996e662 (patch) | |
| tree | ccd9a21daae3daa24ed9a3aff32e082b9721b898 /ui | |
| parent | a67b7f5b5c563e54ca630370cdf7f696e4ce59a5 (diff) | |
| download | wireshark-d894c2e1e0ebe564ac8d9a6ee4a4d75b1996e662.tar.gz | |
Use g_queue_free_full() only on GLib > 2.32
Change-Id: I7a72fe8243fc809b444f1b026ed872cd2aa92245
Reviewed-on: https://code.wireshark.org/review/2686
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/tap-sequence-analysis.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ui/tap-sequence-analysis.c b/ui/tap-sequence-analysis.c index 6b9e9d4933..3177788e83 100644 --- a/ui/tap-sequence-analysis.c +++ b/ui/tap-sequence-analysis.c @@ -263,9 +263,19 @@ sequence_analysis_list_free(seq_analysis_info_t *sainfo) if (!sainfo) return; /* free the graph data items */ - g_queue_free_full(sainfo->items, sequence_analysis_item_free); +#if GLIB_CHECK_VERSION (2, 32, 0) + g_queue_free_full(sainfo->items, sequence_analysis_item_free); +#else + { + GList *list = g_queue_peek_nth_link(sainfo->items, 0); + while (list) + { + sequence_analysis_item_free(list->data); + } + g_queue_free(sainfo->items); + } +#endif - sainfo->items = NULL; sainfo->nconv = 0; sainfo->items = g_queue_new(); |