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

[obnox/wireshark/wip.git] / color.h

diff --git a/color.h b/color.h
index bbc04bd388944fcab5b5c74ebe7c58314760b39d..7ff62bb945d741b30d7f65b9720dcd9730524e4f 100644 (file)
--- a/color.h
+++ b/color.h
@@ -4,10 +4,9 @@
  * $Id$
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
  *
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
@@ -26,8 +25,6 @@
 #ifndef __COLOR_H__
 #define __COLOR_H__
 
-#include "epan/dfilter/dfilter.h"
-
 /*
  * Data structure holding RGB value for a color.
  *
@@ -44,23 +41,16 @@ typedef struct {
        guint16 blue;
 } color_t;
 
-/* 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;
-
-void
-filter_list_prime_edt(epan_dissect_t *edt);
+/** Initialize a color with R, G, and B values, including any toolkit-dependent
+ ** work that needs to be done.
+ *
+ * @param color the color_t to be filled
+ * @param red the red value for the color
+ * @param green the green value for the color
+ * @param blue the blue value for the color
+ * @param source the GdkColor to be filled
+ * @return TRUE if it succeeds, FALSE if it fails
+ */
+gboolean initialize_color(color_t *color, guint16 red, guint16 green, guint16 blue);
 
 #endif