Move the color-filter related stuff out of "color.h" into

"color_filters.h", as that's the appropriate place for it - "color.h"
should just deal with "color_t".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11503 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/color.h b/color.h
index 449eddcea52404994d0cacff3a53f44d1e7a7315..7ff62bb945d741b30d7f65b9720dcd9730524e4f 100644 (file)
--- a/color.h
+++ b/color.h
@@ -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 9b5aa2a0341bc2e3a7daf6ac093edae4e3162ea9..f30404763892c2de5ca6fbeba3b281f84f167699 100644 (file)
--- 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

diff --git a/file.c b/file.c
index c6337053ac018330b8a1c044435f9a9f3f61c522..22dd6373382b7071b87d66a46937b646cc2519b2 100644 (file)
--- a/file.c
+++ b/file.c
@@ -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 4a5c2590a046d613fc72ce6c13a8ae94c1fd2261..bbcac0b20898b0ec28c14c5b48e12f5c0114e292 100644 (file)
--- 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 ff996a36527f8f449a3e9bac937ad2d3d189c065..1ac45fef53f9107094e57e7cf9f970a164bd461e 100644 (file)
--- 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"