diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-15 18:29:22 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-15 18:29:22 +0000 |
| commit | e9a185749c17c74cd678af77bc84212507abea4d (patch) | |
| tree | a8854b74940f0409de4d1f7e306266f4c56ca8e6 | |
| parent | 08bf19111f4c7e503d72a66ea8f9afb89c85750d (diff) | |
Moved setting of E_MPACKET_LIST_KEY object data to the function creating
packet_list to ensure it's created before we set it.
Applying filter from the packet list still doesn't work correctly.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25454 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | gtk/main_filter_toolbar.c | 1 | ||||
| -rw-r--r-- | gtk/main_packet_list.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/gtk/main_filter_toolbar.c b/gtk/main_filter_toolbar.c index 2192bdd946..2d1f1fbdab 100644 --- a/gtk/main_filter_toolbar.c +++ b/gtk/main_filter_toolbar.c @@ -210,7 +210,6 @@ GtkWidget *filter_toolbar_new() filter_te); set_toolbar_object_data(E_DFILTER_TE_KEY, filter_te); g_object_set_data(G_OBJECT(popup_menu_object), E_DFILTER_TE_KEY, filter_te); - g_object_set_data(G_OBJECT(popup_menu_object), E_MPACKET_LIST_KEY, packet_list); return filter_tb; } diff --git a/gtk/main_packet_list.c b/gtk/main_packet_list.c index 065dfb117a..c503859b03 100644 --- a/gtk/main_packet_list.c +++ b/gtk/main_packet_list.c @@ -534,6 +534,7 @@ packet_list_new(e_prefs *prefs) g_object_get_data(G_OBJECT(popup_menu_object), PM_PACKET_LIST_KEY)); g_signal_connect(packet_list, "button_press_event", G_CALLBACK(packet_list_button_pressed_cb), NULL); + g_object_set_data(G_OBJECT(popup_menu_object), E_MPACKET_LIST_KEY, packet_list); gtk_clist_set_compare_func(GTK_CLIST(packet_list), packet_list_compare); gtk_widget_show(packet_list); |