diff options
| -rw-r--r-- | color.h | 28 | ||||
| -rw-r--r-- | color_filters.h | 26 | ||||
| -rw-r--r-- | file.c | 1 | ||||
| -rw-r--r-- | gtk/font_utils.c | 1 | ||||
| -rw-r--r-- | gtk/packet_list.c | 1 |
5 files changed, 29 insertions, 28 deletions
@@ -25,8 +25,6 @@ #ifndef __COLOR_H__ #define __COLOR_H__ -#include "epan/dfilter/dfilter.h" - /* * Data structure holding RGB value for a color. * @@ -55,30 +53,4 @@ typedef struct { */ gboolean initialize_color(color_t *color, guint16 red, guint16 green, guint16 blue); -/* Data for a color filter. */ -typedef struct _color_filter { - gchar *filter_name; /* name of the filter */ - gchar *filter_text; /* text of the filter expression */ - color_t bg_color; /* background color for packets that match */ - color_t fg_color; /* foreground color for packets that match */ - dfilter_t *c_colorfilter; /* compiled filter expression */ - void *edit_dialog; /* if filter is being edited, dialog - * box for it */ - gboolean marked; /* set if the filter is marked in the color dialog box */ -} color_filter_t; - -/* List of all color filters. */ -extern GSList *filter_list; -extern GSList *removed_filter_list; - -/** Add a color filter. - * - * @param colorf the new color filter - * @param arg the color filter widget - */ -void color_add_filter_cb (color_filter_t *colorf, gpointer arg); - -void -filter_list_prime_edt(epan_dissect_t *edt); - #endif diff --git a/color_filters.h b/color_filters.h index 9b5aa2a034..f304047638 100644 --- a/color_filters.h +++ b/color_filters.h @@ -27,6 +27,23 @@ /** @file * Color filters. */ +#include "epan/dfilter/dfilter.h" + +/* Data for a color filter. */ +typedef struct _color_filter { + gchar *filter_name; /* name of the filter */ + gchar *filter_text; /* text of the filter expression */ + color_t bg_color; /* background color for packets that match */ + color_t fg_color; /* foreground color for packets that match */ + dfilter_t *c_colorfilter; /* compiled filter expression */ + void *edit_dialog; /* if filter is being edited, dialog + * box for it */ + gboolean marked; /* set if the filter is marked in the color dialog box */ +} color_filter_t; + +/* List of all color filters. */ +extern GSList *filter_list; +extern GSList *removed_filter_list; /** Init the color filters. */ void colfilter_init(void); @@ -76,4 +93,13 @@ gboolean read_other_filters(gchar *path, gpointer arg); */ gboolean write_other_filters(gchar *path, gboolean only_marked); +/** Add a color filter. + * + * @param colorf the new color filter + * @param arg the color filter widget + */ +void color_add_filter_cb (color_filter_t *colorf, gpointer arg); + +void filter_list_prime_edt(epan_dissect_t *edt); + #endif @@ -67,6 +67,7 @@ #include <epan/filesystem.h> #include "color.h" +#include "color_filters.h" #include "column.h" #include <epan/packet.h> #include "range.h" diff --git a/gtk/font_utils.c b/gtk/font_utils.c index 4a5c2590a0..bbcac0b208 100644 --- a/gtk/font_utils.c +++ b/gtk/font_utils.c @@ -44,6 +44,7 @@ #include "font_utils.h" #include "simple_dialog.h" +#include <epan/packet.h> #include "packet_list.h" #include "proto_draw.h" #include "follow_dlg.h" diff --git a/gtk/packet_list.c b/gtk/packet_list.c index ff996a3652..1ac45fef53 100644 --- a/gtk/packet_list.c +++ b/gtk/packet_list.c @@ -33,6 +33,7 @@ #include "gtkglobals.h" #include "epan/epan.h" #include "color.h" +#include "color_filters.h" #include "../ui_util.h" #include "ui_util.h" #include "main.h" |