diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-07-24 01:16:45 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-07-24 01:16:45 +0000 |
| commit | e62e05a80a778fe06d07bfc8a449a6b953213f4d (patch) | |
| tree | 457adb15ffe836810d4a3381323ad457e596a5b0 | |
| parent | d5425a709a89d182645944ac72f64d579858bdf3 (diff) | |
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.
svn path=/trunk/; revision=11499
| -rw-r--r-- | color.h | 10 | ||||
| -rw-r--r-- | gtk/color_dlg.h | 10 | ||||
| -rw-r--r-- | gtk/color_filters.c | 4 |
3 files changed, 10 insertions, 14 deletions
@@ -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 163467c585..b053caa480 100644 --- 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 be02a7cdd4..67cd5c1af9 100644 --- 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" |