Move color_filters.c and color_filters.h up to the top-level directory,

as they're now (theoretically) toolkit-independent (modulo changes that
might be required to the code to update filter lists when a new filter
is read in).

svn path=/trunk/; revision=11500

6 files changed, 3 insertions, 3 deletions

diff --git a/Makefile.common b/Makefile.common
index a745056efb..eb278e8123 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -154,6 +154,7 @@ ethereal_SOURCES =	\
 	alert_box.c	\
 	capture.c	\
 	capture_combo_utils.c	\
+	color_filters.c	\
 	file.c	\
 	filters.c	\
 	g711.c \
@@ -166,6 +167,7 @@ ethereal_INCLUDES =	\
 	alert_box.h	\
 	capture.h	\
 	capture_combo_utils.h	\
+	color_filters.h	\
 	filters.h	\
 	g711.h	\
 	globals.h	\
diff --git a/gtk/color_filters.c b/color_filters.c
index 67cd5c1af9..67cd5c1af9 100644
--- a/gtk/color_filters.c
+++ b/color_filters.c
diff --git a/gtk/color_filters.h b/color_filters.h
index 9b5aa2a034..9b5aa2a034 100644
--- a/gtk/color_filters.h
+++ b/color_filters.h
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 7a1bc0e6f8..eb176a58ef 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -38,7 +38,6 @@ noinst_HEADERS = \
 	capture_dlg.h	\
 	capture_prefs.h	\
 	color_dlg.h	\
-	color_filters.h	\
 	colors.h	\
 	column_prefs.h	\
 	compat_macros.h	\
diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index ec464f1250..2037131579 100644
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -35,7 +35,6 @@ ETHEREAL_GTK_SRC = \
 	capture_info_dlg.c	\
 	capture_prefs.c	\
 	color_dlg.c	\
-	color_filters.c	\
 	color_utils.c	\
 	colors.c	\
 	column_prefs.c	\
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index 8e59e5978c..26f36b692e 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -50,7 +50,7 @@
 #include "recent.h"
 #include "color.h"
 #include "../ui_util.h"
-#include "gtk/color_filters.h"
+#include "color_filters.h"
 #include "gtk/color_dlg.h"
 #ifdef HAVE_LIBPCAP
 #include "capture_dlg.h"