aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gtk')
-rw-r--r--gtk/Makefile.nmake2
-rw-r--r--gtk/capture_dlg.c4
-rw-r--r--gtk/color_dlg.c6
-rw-r--r--gtk/colors.c6
-rw-r--r--gtk/colors.h11
-rw-r--r--gtk/decode_as_dlg.c6
-rw-r--r--gtk/display_opts.c8
-rw-r--r--gtk/file_dlg.c4
-rw-r--r--gtk/find_dlg.c9
-rw-r--r--gtk/follow_dlg.c6
-rw-r--r--gtk/goto_dlg.c4
-rw-r--r--gtk/help_dlg.c4
-rw-r--r--gtk/main.c18
-rw-r--r--gtk/menu.c10
-rw-r--r--gtk/nameres_prefs.c4
-rw-r--r--gtk/packet_win.c14
-rw-r--r--gtk/plugins_dlg.c7
-rw-r--r--gtk/prefs_dlg.c4
-rw-r--r--gtk/print_dlg.c4
-rw-r--r--gtk/proto_draw.c4
-rw-r--r--gtk/tcp_graph.c4
21 files changed, 68 insertions, 71 deletions
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 8b7488a059..9f6f07a291 100644
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -2,7 +2,7 @@ include ..\config.nmake
############### no need to modify below this line #########
-CFLAGS=-DHAVE_CONFIG_H /I.. /I../epan /I../wiretap \
+CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
/I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 8bf437d433..49eabe85e6 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -1,7 +1,7 @@
/* capture_dlg.c
* Routines for packet capture windows
*
- * $Id: capture_dlg.c,v 1.56 2002/01/13 20:35:11 guy Exp $
+ * $Id: capture_dlg.c,v 1.57 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -47,7 +47,7 @@
#include "capture.h"
#include "globals.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "main.h"
#include "ui_util.h"
#include "capture_dlg.h"
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index 2672a98eaf..a04416c24c 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -1,7 +1,7 @@
/* color_dlg.c
* Definitions for dialog boxes for color filters
*
- * $Id: color_dlg.c,v 1.11 2001/12/03 02:37:25 guy Exp $
+ * $Id: color_dlg.c,v 1.12 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -38,11 +38,11 @@
#endif
#include "gtk/main.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "colors.h"
#include "color_dlg.h"
#include "file.h"
-#include "dfilter/dfilter.h"
+#include <epan/dfilter/dfilter.h>
#include "simple_dialog.h"
#include "dlg_utils.h"
#include "ui_util.h"
diff --git a/gtk/colors.c b/gtk/colors.c
index bfd7ead5c6..e24e844f65 100644
--- a/gtk/colors.c
+++ b/gtk/colors.c
@@ -1,7 +1,7 @@
/* colors.c
* Definitions for color structures and routines
*
- * $Id: colors.c,v 1.18 2002/01/08 21:35:17 guy Exp $
+ * $Id: colors.c,v 1.19 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -43,10 +43,10 @@
#include <epan/filesystem.h>
#include "gtk/main.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "colors.h"
#include "file.h"
-#include "dfilter/dfilter.h"
+#include <epan/dfilter/dfilter.h>
#include "simple_dialog.h"
extern capture_file cf;
diff --git a/gtk/colors.h b/gtk/colors.h
index b5e80ff67d..8f1a3d6f81 100644
--- a/gtk/colors.h
+++ b/gtk/colors.h
@@ -1,12 +1,11 @@
/* colors.h
* Definitions for color structures and routines
*
- * $Id: colors.h,v 1.5 2001/12/18 19:09:07 gram Exp $
+ * $Id: colors.h,v 1.6 2002/01/21 07:37:41 guy Exp $
*
* 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
@@ -25,10 +24,10 @@
#ifndef __COLORS_H__
#define __COLORS_H__
-#include "proto.h"
-#include "dfilter/dfilter.h"
+#include <epan/proto.h>
+#include <epan/dfilter/dfilter.h>
#include <gtk/gtk.h>
-#include "epan.h"
+#include <epan/epan.h>
#define MAXCOLORS 255
#define MAX_COLOR_FILTER_NAME_LEN 33
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index 13b45d64e5..ddcff3fa05 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -1,6 +1,6 @@
/* decode_as_dlg.c
*
- * $Id: decode_as_dlg.c,v 1.21 2001/12/18 19:09:07 gram Exp $
+ * $Id: decode_as_dlg.c,v 1.22 2002/01/21 07:37:41 guy Exp $
*
* Routines to modify dissector tables on the fly.
*
@@ -42,10 +42,10 @@
#include "dlg_utils.h"
#include "globals.h"
#include "simple_dialog.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "ipproto.h"
#include "ui_util.h"
-#include "epan_dissect.h"
+#include <epan/epan_dissect.h>
#undef DEBUG
diff --git a/gtk/display_opts.c b/gtk/display_opts.c
index 5c493e660b..b0cd04af61 100644
--- a/gtk/display_opts.c
+++ b/gtk/display_opts.c
@@ -1,7 +1,7 @@
/* display_opts.c
* Routines for packet display windows
*
- * $Id: display_opts.c,v 1.24 2002/01/13 20:35:11 guy Exp $
+ * $Id: display_opts.c,v 1.25 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -51,9 +51,9 @@
#endif
#include "globals.h"
-#include "resolv.h"
-#include "timestamp.h"
-#include "packet.h"
+#include <epan/resolv.h>
+#include <epan/timestamp.h>
+#include <epan/packet.h>
#include "file.h"
#include "display_opts.h"
#include "ui_util.h"
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index 2257894a5f..e95c7a812b 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -1,7 +1,7 @@
/* file_dlg.c
* Dialog boxes for handling files
*
- * $Id: file_dlg.c,v 1.47 2002/01/13 20:35:11 guy Exp $
+ * $Id: file_dlg.c,v 1.48 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -42,7 +42,7 @@
#include "globals.h"
#include "gtkglobals.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "keys.h"
#include "filter_prefs.h"
#include "ui_util.h"
diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index 18b827f8f5..99dc35ef6d 100644
--- a/gtk/find_dlg.c
+++ b/gtk/find_dlg.c
@@ -1,12 +1,11 @@
/* find_dlg.c
* Routines for "find frame" window
*
- * $Id: find_dlg.c,v 1.19 2001/02/01 20:21:21 gram Exp $
+ * $Id: find_dlg.c,v 1.20 2002/01/21 07:37:41 guy Exp $
*
* 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
@@ -36,8 +35,8 @@
#include <glib.h>
-#include "proto.h"
-#include "dfilter/dfilter.h"
+#include <epan/proto.h>
+#include <epan/dfilter/dfilter.h>
#include "globals.h"
#include "ui_util.h"
diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c
index eac6965fd7..65751ee27f 100644
--- a/gtk/follow_dlg.c
+++ b/gtk/follow_dlg.c
@@ -1,6 +1,6 @@
/* follow_dlg.c
*
- * $Id: follow_dlg.c,v 1.19 2002/01/18 19:46:19 guy Exp $
+ * $Id: follow_dlg.c,v 1.20 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -68,10 +68,10 @@
#include "simple_dialog.h"
#include "packet-ipv6.h"
#include "prefs.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "util.h"
#include "ui_util.h"
-#include "epan_dissect.h"
+#include <epan/epan_dissect.h>
/* Show Stream */
typedef enum {
diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c
index 6fde232e79..0fed71f650 100644
--- a/gtk/goto_dlg.c
+++ b/gtk/goto_dlg.c
@@ -1,7 +1,7 @@
/* goto_dlg.c
* Routines for "go to frame" window
*
- * $Id: goto_dlg.c,v 1.13 2002/01/11 07:40:31 guy Exp $
+ * $Id: goto_dlg.c,v 1.14 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -37,7 +37,7 @@
#include <glib.h>
-#include "proto.h"
+#include <epan/proto.h>
#include "globals.h"
#include "goto_dlg.h"
diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c
index 9d6941502e..2f4087d1cb 100644
--- a/gtk/help_dlg.c
+++ b/gtk/help_dlg.c
@@ -1,6 +1,6 @@
/* help_dlg.c
*
- * $Id: help_dlg.c,v 1.20 2002/01/11 07:40:31 guy Exp $
+ * $Id: help_dlg.c,v 1.21 2002/01/21 07:37:41 guy Exp $
*
* Laurent Deniel <deniel@worldnet.fr>
*
@@ -46,7 +46,7 @@
#include "gtkglobals.h"
#include "main.h"
#include "ui_util.h"
-#include "proto.h"
+#include <epan/proto.h>
typedef enum {
OVERVIEW_HELP,
diff --git a/gtk/main.c b/gtk/main.c
index 5a2ad80efe..68d0fabbab 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
/* main.c
*
- * $Id: main.c,v 1.230 2002/01/18 07:29:40 guy Exp $
+ * $Id: main.c,v 1.231 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -111,13 +111,13 @@
#include <conio.h>
#endif
-#include <epan.h>
+#include <epan/epan.h>
#include <epan/filesystem.h>
-#include <epan_dissect.h>
+#include <epan/epan_dissect.h>
#include "main.h"
-#include "timestamp.h"
-#include "packet.h"
+#include <epan/timestamp.h>
+#include <epan/packet.h>
#include "capture.h"
#include "summary.h"
#include "file.h"
@@ -131,20 +131,20 @@
#include "file_dlg.h"
#include "column.h"
#include "print.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#ifdef HAVE_LIBPCAP
#include "pcap-util.h"
#endif
#include "statusbar.h"
#include "simple_dialog.h"
#include "proto_draw.h"
-#include "dfilter/dfilter.h"
+#include <epan/dfilter/dfilter.h>
#include "keys.h"
#include "packet_win.h"
#include "gtkglobals.h"
-#include "plugins.h"
+#include <epan/plugins.h>
#include "colors.h"
-#include "strutil.h"
+#include <epan/strutil.h>
#include "register.h"
#include "ringbuffer.h"
#include "ui_util.h"
diff --git a/gtk/menu.c b/gtk/menu.c
index 732daf8b24..cb542145c3 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
/* menu.c
* Menu routines
*
- * $Id: menu.c,v 1.61 2002/01/13 20:35:12 guy Exp $
+ * $Id: menu.c,v 1.62 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -40,8 +40,8 @@
#include "main.h"
#include "menu.h"
-#include "packet.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
#include "prefs.h"
#include "capture_dlg.h"
#include "color_dlg.h"
@@ -60,9 +60,9 @@
#include "proto_dlg.h"
#include "proto_hier_stats_dlg.h"
#include "keys.h"
-#include "plugins.h"
+#include <epan/plugins.h>
#include "tcp_graph.h"
-#include "epan_dissect.h"
+#include <epan/epan_dissect.h>
GtkWidget *popup_menu_object;
diff --git a/gtk/nameres_prefs.c b/gtk/nameres_prefs.c
index 08d10587fd..6ae9ea49af 100644
--- a/gtk/nameres_prefs.c
+++ b/gtk/nameres_prefs.c
@@ -1,7 +1,7 @@
/* nameres_prefs.c
* Dialog box for name resolution preferences
*
- * $Id: nameres_prefs.c,v 1.2 2002/01/20 20:05:18 guy Exp $
+ * $Id: nameres_prefs.c,v 1.3 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -33,7 +33,7 @@
#include "globals.h"
#include "nameres_prefs.h"
#include "gtkglobals.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "prefs.h"
#include "prefs_dlg.h"
#include "ui_util.h"
diff --git a/gtk/packet_win.c b/gtk/packet_win.c
index 302eefa327..922cd3ff5d 100644
--- a/gtk/packet_win.c
+++ b/gtk/packet_win.c
@@ -3,7 +3,7 @@
*
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet_win.c,v 1.31 2002/01/11 07:40:31 guy Exp $
+ * $Id: packet_win.c,v 1.32 2002/01/21 07:37:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -45,10 +45,10 @@
#include <unistd.h>
#endif
-#include <epan.h>
+#include <epan/epan.h>
#include "main.h"
-#include "timestamp.h"
-#include "packet.h"
+#include <epan/timestamp.h>
+#include <epan/packet.h>
#include "summary.h"
#include "file.h"
#include "prefs.h"
@@ -56,14 +56,14 @@
#include "../menu.h"
#include "column.h"
#include "print.h"
-#include "resolv.h"
+#include <epan/resolv.h>
#include "packet_win.h"
#include "simple_dialog.h"
#include "proto_draw.h"
#include "keys.h"
#include "gtkglobals.h"
-#include "plugins.h"
-#include "epan_dissect.h"
+#include <epan/plugins.h>
+#include <epan/epan_dissect.h>
/* Data structure holding information about a packet-detail window. */
struct PacketWinData {
diff --git a/gtk/plugins_dlg.c b/gtk/plugins_dlg.c
index 5f427fcd03..41d861dd29 100644
--- a/gtk/plugins_dlg.c
+++ b/gtk/plugins_dlg.c
@@ -1,13 +1,12 @@
/* plugins_dlg.c
* Dialog boxes for plugins
*
- * $Id: plugins_dlg.c,v 1.22 2001/01/28 21:17:29 guy Exp $
+ * $Id: plugins_dlg.c,v 1.23 2002/01/21 07:37:42 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1999 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
@@ -38,7 +37,7 @@
#include <gtk/gtk.h>
#include "globals.h"
-#include "plugins.h"
+#include <epan/plugins.h>
#include "dlg_utils.h"
#ifdef HAVE_PLUGINS
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index e3fad138c3..f9ad6da158 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1,7 +1,7 @@
/* prefs_dlg.c
* Routines for handling preferences
*
- * $Id: prefs_dlg.c,v 1.40 2002/01/20 20:05:18 guy Exp $
+ * $Id: prefs_dlg.c,v 1.41 2002/01/21 07:37:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -48,7 +48,7 @@
#include <epan/filesystem.h>
#include "main.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "file.h"
#include "prefs.h"
#include "column_prefs.h"
diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
index 09de73e4eb..6cdd14211a 100644
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.c
@@ -1,7 +1,7 @@
/* print_dlg.c
* Dialog boxes for printing
*
- * $Id: print_dlg.c,v 1.28 2002/01/11 07:40:31 guy Exp $
+ * $Id: print_dlg.c,v 1.29 2002/01/21 07:37:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -37,7 +37,7 @@
#include "simple_dialog.h"
#include "ui_util.h"
#include "dlg_utils.h"
-#include "epan_dissect.h"
+#include <epan/epan_dissect.h>
/* On Win32, a GUI application apparently can't use "popen()" (it
"returns an invalid file handle, if used in a Windows program,
diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index 9f99842786..a950d3a79d 100644
--- a/gtk/proto_draw.c
+++ b/gtk/proto_draw.c
@@ -1,7 +1,7 @@
/* proto_draw.c
* Routines for GTK+ packet display
*
- * $Id: proto_draw.c,v 1.44 2002/01/11 07:40:31 guy Exp $
+ * $Id: proto_draw.c,v 1.45 2002/01/21 07:37:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -47,7 +47,7 @@
#include <string.h>
#include "main.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "util.h"
#include "menu.h"
#include "keys.h"
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 54ca6f922c..adc5a7210d 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -3,7 +3,7 @@
* By Pavel Mores <pvl@uh.cz>
* Win32 port: rwh@unifiedtech.com
*
- * $Id: tcp_graph.c,v 1.12 2002/01/11 07:40:32 guy Exp $
+ * $Id: tcp_graph.c,v 1.13 2002/01/21 07:37:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -43,7 +43,7 @@
#endif /* WIN32 */
#include "globals.h" /* cfile */
-#include "packet.h" /* frame_data */
+#include <epan/packet.h> /* frame_data */
#include "gtkglobals.h" /* packet_list */
#include "simple_dialog.h"
#include "ui_util.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 13:06:30 +0000