Move the declaration of "color_add_filter_cb()" to "color.h", as,

although it currently takes a pointer to a GtkWidget as its second
argument, that argument is actually a "void *", so it's sort-of
toolkit-independent.

That lets us get rid of all GTK+ references in "gtk/color_filters.c", so
we can move it up to the top-level directory; get rid of the <gtk/gtk.h>
include, in favor of a <glib.h> include.

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

diff --git a/color.h b/color.h
index 56f9f1a90984215e4f90df6cb78107c25c7f19a4..043f3b07d80d12382e73edeaa7ffccbef2f228db 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
@@ -72,6 +71,13 @@ typedef struct _color_filter {
 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);
 

diff --git a/gtk/color_dlg.h b/gtk/color_dlg.h
index 163467c585b315f57f60f0ca7049af98a0592ff4..b053caa4801beb8ed2b80e9ccfed328d1c9ba803 100644 (file)
--- a/gtk/color_dlg.h
+++ b/gtk/color_dlg.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
@@ -50,11 +49,4 @@ void color_display_with_filter(char *filter);
  */
 int color_marked_count(void);
 
-/** 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);
-
 #endif /* color_dlg.h */

diff --git a/gtk/color_filters.c b/gtk/color_filters.c
index be02a7cdd44ddd8d2b1164bee0b58cb4ce8589d4..67cd5c1af9031a0ee7bfd1759be314d4a935d9ac 100644 (file)
--- a/gtk/color_filters.c
+++ b/gtk/color_filters.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <gtk/gtk.h>
+#include <glib.h>
 #include <ctype.h>
 #include <string.h>
 
@@ -36,9 +36,7 @@
 
 #include <epan/packet.h>
 #include "color.h"
-#include "colors.h"
 #include "color_filters.h"
-#include "color_dlg.h"
 #include "file.h"
 #include <epan/dfilter/dfilter.h>
 #include "simple_dialog.h"