aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-02-07 19:44:19 -0500
committerMichael Mann <mmann78@netscape.net>2017-02-08 14:24:28 +0000
commit243c09fa06bf7646b577e2baf024106432ec1bd9 (patch)
tree7e0385427dd99477b9d8fdc262d2d52c67ee402e /ui/gtk
parent64a00dc0a81f13d033cc1e7f532a99cdda14cca8 (diff)
Switch export objects to use wmem_tree_t instead of (sorted) GSList.
Change-Id: Iaaa7b44954337c7857dbb541b727924e2de57c9d Reviewed-on: https://code.wireshark.org/review/20016 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/gtk')
-rw-r--r--ui/gtk/main_menubar.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 59d2041db6..1ced34fece 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -2818,11 +2818,11 @@ menu_exportobject_cb(GtkAction *action _U_, gpointer user_data)
exportobject_cb(eo);
}
-static void
-add_export_object_menuitem(gpointer data, gpointer user_data)
+static gboolean
+add_export_object_menuitem(const void *key _U_, void *value, void *userdata)
{
- register_eo_t *eo = (register_eo_t*)data;
- eo_menu_t *eo_menu_data = (eo_menu_t*)user_data;
+ register_eo_t *eo = (register_eo_t*)value;
+ eo_menu_t *eo_menu_data = (eo_menu_t*)userdata;
gchar *action_name;
GtkAction *action;
@@ -2846,6 +2846,7 @@ add_export_object_menuitem(gpointer data, gpointer user_data)
FALSE);
g_free(action_name);
eo_menu_data->counter++;
+ return FALSE;
}
static void