diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-05 22:42:47 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-05 22:42:47 +0000 |
| commit | fdaebbf4975f970f7dce82341920c20ad6098e0f (patch) | |
| tree | 2654abe47f378933a5d325856a7b3f877338dd19 /gtk/conversations_table.c | |
| parent | 0242e35e0c6a335b92d6ca5e29714efb96a580df (diff) | |
Have tap listeners specify whether the "packet" routine requires
a protocol tree;
the column values.
This includes stats-tree listeners.
Have the routines to build the packet list, and to retap packets, honor
those requirements. This means that cf_retap_packets() no longer needs
an argument to specify whether to construct the column values or not, so
get rid of that argument.
This also means that there's no need for a tap to have a fake filter
to ensure that the protocol tree will be built, so don't set up a fake
"frame" filter.
While we're at it, clean up some cases where "no filter" was represented
as a null string rather than a null pointer.
Have a routine to return an indication of the number of tap listeners
with filters; use that rather than the global num_tap_filters.
Clean up some indentation and some gboolean vs. gint items.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28645 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/conversations_table.c')
| -rw-r--r-- | gtk/conversations_table.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c index ba7ba99bdb..7a3e73f9c6 100644 --- a/gtk/conversations_table.c +++ b/gtk/conversations_table.c @@ -1289,7 +1289,7 @@ init_ct_table_page(conversations_table *conversations, GtkWidget *vbox, gboolean ct_create_popup_menu(conversations); /* register the tap and rerun the taps on the packet list */ - error_string=register_tap_listener(tap_name, conversations, filter, reset_ct_table_data_cb, packet_func, draw_ct_table_data_cb); + error_string=register_tap_listener(tap_name, conversations, filter, 0, reset_ct_table_data_cb, packet_func, draw_ct_table_data_cb); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); @@ -1356,7 +1356,7 @@ init_conversation_table(gboolean hide_ports, const char *table_name, const char gtk_widget_show_all(conversations->win); window_present(conversations->win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(conversations->win->window); /* Keep clist frozen to cause modifications to the clist (inserts, appends, others that are extremely slow @@ -1490,7 +1490,7 @@ ct_filter_toggle_dest(GtkWidget *widget, gpointer data) reset_ct_table_data(conversations); } - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); if (conversations) { gdk_window_raise(conversations->win->window); } @@ -1601,7 +1601,7 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_) gtk_widget_show_all(win); window_present(win); - cf_retap_packets(&cfile, FALSE); + cf_retap_packets(&cfile); gdk_window_raise(win->window); /* after retapping, redraw table */ |