Don't include color.h

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

diff --git a/gtk/expert_comp_table.c b/gtk/expert_comp_table.c
index fd3825d4e13bdc4ce5beae8bbb106cd7d1356159..fde24724875c31808a7b3019133caf294d9dcac1 100644 (file)
--- a/gtk/expert_comp_table.c
+++ b/gtk/expert_comp_table.c
@@ -42,7 +42,6 @@
 #include <epan/expert.h>
 
 #include "../simple_dialog.h"
-#include "../color.h"
 
 #include "gtk/expert_comp_table.h"
 #include "gtk/filter_utils.h"

diff --git a/gtk/follow_ssl.c b/gtk/follow_ssl.c
index e7c74ec114b287eed7884e862369b24f9c37bef2..82bc680c87530a7e1b4c4a2a77a95427ce87d2c6 100644 (file)
--- a/gtk/follow_ssl.c
+++ b/gtk/follow_ssl.c
@@ -46,7 +46,6 @@
 #include <epan/filesystem.h>
 #include <epan/tap.h>
 
-#include <../color.h>
 #include <../alert_box.h>
 #include <../simple_dialog.h>
 #include <../util.h>

diff --git a/gtk/follow_tcp.c b/gtk/follow_tcp.c
index d23f00aa31ce39c5dd528afb5c78248122a20a1f..abfe66b0883576179847ae86c8acfc76192e4a9d 100644 (file)
--- a/gtk/follow_tcp.c
+++ b/gtk/follow_tcp.c
@@ -48,7 +48,6 @@
 #include <epan/ipproto.h>
 #include <epan/charsets.h>
 
-#include "../color.h"
 #include "../file.h"
 #include "../alert_box.h"
 #include "../simple_dialog.h"

diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c
index 1d01b562a12eb0f3aa60e63c0733ba8563fe8c78..dd077e49c435b0296d14cba40b1718f65d2a72da 100644 (file)
--- a/gtk/graph_analysis.c
+++ b/gtk/graph_analysis.c
@@ -52,7 +52,6 @@
 #include "epan/filesystem.h"
 
 #include "../util.h"
-#include "../color.h"
 #include "../simple_dialog.h"
 #include "../alert_box.h"
 #include <wsutil/file_util.h>

diff --git a/gtk/iax2_analysis.c b/gtk/iax2_analysis.c
index 709f4254e8b86ec3cff301b85341d1a0ce98a746..c32ca9819cff07baec99725c4b278028e536b2f9 100644 (file)
--- a/gtk/iax2_analysis.c
+++ b/gtk/iax2_analysis.c
@@ -70,7 +70,6 @@
 #include "../simple_dialog.h"
 #include "../stat_menu.h"
 #include "../progress_dlg.h"
-#include "../color.h"
 #include "../tempfile.h"
 #include <wsutil/file_util.h>
 
@@ -3392,7 +3391,7 @@ void iax2_analysis(
        user_data_t *user_data;
        int fd;
        int i;
-       static color_t col[MAX_GRAPHS] = {
+       static GdkColor col[MAX_GRAPHS] = {
                {0,     0x0000, 0x0000, 0x0000},
                {0,     0xffff, 0x0000, 0x0000},
                {0,     0x0000, 0xffff, 0x0000},

diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index 2e49c004e672bfc6ea8232923d9c447f4a0409f9..d3c5391e1b07211fb3fafd5f4c433b1a0bf9f35c 100644 (file)
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -47,7 +47,6 @@
 #include "../stat_menu.h"
 #include "../alert_box.h"
 #include "../simple_dialog.h"
-#include "../color.h"
 
 #include "gtk/gtkglobals.h"
 #include "gtk/gui_utils.h"
@@ -1257,7 +1256,7 @@ iostat_init(const char *optarg _U_, void* userdata _U_)
 {
        io_stat_t *io;
        int i=0;
-       static color_t col[MAX_GRAPHS] = {
+       static GdkColor col[MAX_GRAPHS] = {
                {0,     0x0000, 0x0000, 0x0000},
                {0,     0xffff, 0x0000, 0x0000},
                {0,     0x0000, 0xffff, 0x0000},

diff --git a/gtk/main_toolbar.c b/gtk/main_toolbar.c
index d1a7043767931d470caaa93fef78ee93adbb2e2d..9e9833190954d7f4d2978d03ef16f017a79ee382 100644 (file)
--- a/gtk/main_toolbar.c
+++ b/gtk/main_toolbar.c
@@ -36,7 +36,6 @@
 #include <epan/prefs.h>
 #include <epan/dfilter/dfilter.h>
 
-#include "../color.h"
 #include "../color_filters.h"
 
 #ifdef HAVE_LIBPCAP

diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index aca283cffdaefb99cdf9a99ac2f488d7d35d6fb7..0a4d8ed1a19b72a1c6eb0320c0aeba1583eeda34 100644 (file)
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -68,7 +68,6 @@
 #include "../simple_dialog.h"
 #include "../stat_menu.h"
 #include "../progress_dlg.h"
-#include "../color.h"
 #include "../tempfile.h"
 #include <wsutil/file_util.h>
 
@@ -3549,7 +3548,7 @@ void rtp_analysis(
        user_data_t *user_data;
        int fd;
        int i;
-       static color_t col[MAX_GRAPHS] = {
+       static GdkColor col[MAX_GRAPHS] = {
                {0,     0x0000, 0x0000, 0x0000},
                {0,     0xffff, 0x0000, 0x0000},
                {0,     0x0000, 0xffff, 0x0000},

diff --git a/gtk/sctp_byte_graph_dlg.c b/gtk/sctp_byte_graph_dlg.c
index 2f502048df700ff9110cc091677d4b025e1bb964..b42573525a26920118900aa65bedb54c03bededa 100644 (file)
--- a/gtk/sctp_byte_graph_dlg.c
+++ b/gtk/sctp_byte_graph_dlg.c
@@ -35,7 +35,6 @@
 #include <epan/strutil.h>
 
 #include "../globals.h"
-#include "../color.h"
 #include "../ui_util.h"
 #include "../simple_dialog.h"
 

diff --git a/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c
index ea4bb86298647c18825fe45113c4b840bc78c00c..34069707226c6e740aa98792732745b248e15899 100644 (file)
--- a/gtk/sctp_graph_dlg.c
+++ b/gtk/sctp_graph_dlg.c
@@ -36,7 +36,6 @@
 #include <epan/strutil.h>
 
 #include "../globals.h"
-#include "../color.h"
 #include "../ui_util.h"
 #include "../simple_dialog.h"