Move color_filters.c and color_filters.h up to the top-level directory,
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 24 Jul 2004 01:29:12 +0000 (01:29 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 24 Jul 2004 01:29:12 +0000 (01:29 +0000)
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).

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

Makefile.common
color_filters.c [moved from gtk/color_filters.c with 100% similarity]
color_filters.h [moved from gtk/color_filters.h with 100% similarity]
gtk/Makefile.am
gtk/Makefile.common
gtk/file_dlg.c

index a745056..eb278e8 100644 (file)
@@ -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       \
similarity index 100%
rename from gtk/color_filters.c
rename to color_filters.c
similarity index 100%
rename from gtk/color_filters.h
rename to color_filters.h
index 7a1bc0e..eb176a5 100644 (file)
@@ -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 \
index ec464f1..2037131 100644 (file)
@@ -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  \
index 8e59e59..26f36b6 100644 (file)
@@ -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"