aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/export_object.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2009-06-05 22:42:47 +0000
committerGuy Harris <guy@alum.mit.edu>2009-06-05 22:42:47 +0000
commitcf91fdf16b2d961024ea062503ce5fb91af28186 (patch)
tree2654abe47f378933a5d325856a7b3f877338dd19 /gtk/export_object.c
parentf84499059642f102c7272e72f74d7a986f51b520 (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. svn path=/trunk/; revision=28645
Diffstat (limited to 'gtk/export_object.c')
-rw-r--r--gtk/export_object.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/export_object.c b/gtk/export_object.c
index 08d9015c2b..cde07a8ac8 100644
--- a/gtk/export_object.c
+++ b/gtk/export_object.c
@@ -283,7 +283,7 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_
object_list = g_malloc0(sizeof(export_object_list_t));
/* Data will be gathered via a tap callback */
- error_msg = register_tap_listener(tapname, object_list, NULL,
+ error_msg = register_tap_listener(tapname, object_list, NULL, 0,
eo_reset,
tap_packet,
eo_draw);
@@ -421,5 +421,5 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_
gtk_widget_show_all(object_list->dlg);
window_present(object_list->dlg);
- cf_retap_packets(&cfile, FALSE);
+ cf_retap_packets(&cfile);
}