diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-28 21:17:29 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-28 21:17:29 +0000 |
| commit | cc74cc0a5ff013512ae2157f70d0a5d32c3302cc (patch) | |
| tree | 96b4f79629bd08207bb9f39f42a01193b6b22f59 /file.c | |
| parent | 7eaadf404879210df9e33309e3f3db2c72e56fc6 (diff) | |
| download | wireshark-cc74cc0a5ff013512ae2157f70d0a5d32c3302cc.tar.gz wireshark-cc74cc0a5ff013512ae2157f70d0a5d32c3302cc.tar.bz2 wireshark-cc74cc0a5ff013512ae2157f70d0a5d32c3302cc.zip | |
Get rid of support for old-style plugins (support for old-style plugins
requires that the dfilter code be initialized before the plugins are
added; this required us to *re*-initialize the dfilter code after
reading in all the plugins, as the plugins may themselves have added new
filterable fields - that was a bit of a mess), and make the
"Tools->Plugins" dialog box show the new-style plugins.
svn path=/trunk/; revision=2950
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -1,7 +1,7 @@ /* file.c * File I/O routines * - * $Id: file.c,v 1.227 2000/11/21 23:54:08 guy Exp $ + * $Id: file.c,v 1.228 2001/01/28 21:17:26 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -89,8 +89,6 @@ #include "globals.h" #include "gtk/colors.h" -#include "plugins.h" - extern GtkWidget *packet_list, *info_bar, *byte_view, *tree_view; extern guint file_ctx; @@ -633,16 +631,10 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf, we have a list of color filters; - we have plugins to apply; - allocate a protocol tree root node, so that we'll construct a protocol tree against which a filter expression can be evaluated. */ - if ((cf->dfcode != NULL && refilter) || filter_list != NULL -#ifdef HAVE_PLUGINS - || enabled_plugins_number > 0 -#endif - ) + if ((cf->dfcode != NULL && refilter) || filter_list != NULL) protocol_tree = proto_tree_create_root(); /* Dissect the frame. */ |