diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-02-07 17:05:17 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-03-06 11:41:54 +0000 |
| commit | 56aaa5b705fc87830a0f74f0ad34997ed76f7c92 (patch) | |
| tree | dd6ec6c8d7fee0aa341b5a3b4b2ff136089c36ba /ui/gtk/main_menubar.c | |
| parent | cfa50019b6366404f54da57700e50862aa87ebb0 (diff) | |
Switch conversations to use wmem_tree_t instead of (sorted) GSList.
Change-Id: Ifaf25ca5a7974f1d398ceebbb4c6733d4d3e001a
Reviewed-on: https://code.wireshark.org/review/20006
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk/main_menubar.c')
| -rw-r--r-- | ui/gtk/main_menubar.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 1ced34fece..a9b981b3ca 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -2688,11 +2688,11 @@ typedef struct { int counter; } conv_menu_t; -static void -add_conversation_menuitem(gpointer data, gpointer user_data) +static gboolean +add_conversation_menuitem(const void *key, void *value, void *userdata) { - register_ct_t *table = (register_ct_t*)data; - conv_menu_t *conv = (conv_menu_t*)user_data; + register_ct_t *table = (register_ct_t*)value; + conv_menu_t *conv = (conv_menu_t*)userdata; gchar *action_name; GtkAction *action; @@ -2700,7 +2700,7 @@ add_conversation_menuitem(gpointer data, gpointer user_data) /*g_warning("action_name %s, filter_entry->name %s",action_name,filter_entry->name);*/ action = (GtkAction *)g_object_new (GTK_TYPE_ACTION, "name", action_name, - "label", proto_get_protocol_short_name(find_protocol_by_id(get_conversation_proto_id(table))), + "label", key, "sensitive", TRUE, NULL); g_signal_connect (action, "activate", @@ -2716,6 +2716,7 @@ add_conversation_menuitem(gpointer data, gpointer user_data) FALSE); g_free(action_name); conv->counter++; + return FALSE; } static void @@ -2750,11 +2751,11 @@ menu_hostlist_cb(GtkAction *action _U_, gpointer user_data) hostlist_endpoint_cb(table); } -static void -add_hostlist_menuitem(gpointer data, gpointer user_data) +static gboolean +add_hostlist_menuitem(const void *key, void *value, void *userdata) { - register_ct_t *table = (register_ct_t*)data; - conv_menu_t *conv = (conv_menu_t*)user_data; + register_ct_t *table = (register_ct_t*)value; + conv_menu_t *conv = (conv_menu_t*)userdata; gchar *action_name; GtkAction *action; @@ -2762,7 +2763,7 @@ add_hostlist_menuitem(gpointer data, gpointer user_data) /*g_warning("action_name %s, filter_entry->name %s",action_name,filter_entry->name);*/ action = (GtkAction *)g_object_new (GTK_TYPE_ACTION, "name", action_name, - "label", proto_get_protocol_short_name(find_protocol_by_id(get_conversation_proto_id(table))), + "label", key, "sensitive", TRUE, NULL); g_signal_connect (action, "activate", @@ -2778,6 +2779,7 @@ add_hostlist_menuitem(gpointer data, gpointer user_data) FALSE); g_free(action_name); conv->counter++; + return FALSE; } static void |