g_slist_free_full() didn't appear until GLib 2.28.
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 5 Sep 2011 19:39:34 +0000 (19:39 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 5 Sep 2011 19:39:34 +0000 (19:39 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38885 f5534014-38df-0310-8fa8-9805f1628bb7

gtk/decode_as_dlg.c

index 571bdd09356c4d21cfc94c67dbbc576de40fbf4e..5b570400db4d38cf93213fa1eaee6ed14734156c 100644 (file)
@@ -351,7 +351,7 @@ void write_da_entry(gpointer item, gpointer user_data) {
 /*
  * Free memory used by the da_entry
  */
-void free_da_entry(gpointer item) {
+void free_da_entry(gpointer item, gpointer user_data _U_) {
   da_entry_t *entry = (da_entry_t *)item;
   g_free(entry->table);
   g_free(entry->initial);
@@ -657,7 +657,8 @@ decode_show_destroy_cb (GtkWidget *win _U_, gpointer user_data _U_)
     decode_show_w = NULL;
 
     /* Clear saved "Decode As" entries. */
-    g_slist_free_full(da_entries, free_da_entry);
+    g_slist_foreach(da_entries, free_da_entry, NULL);
+    g_slist_free(da_entries);
     da_entries = NULL;
 }