diff options
Diffstat (limited to 'gtk')
38 files changed, 58 insertions, 194 deletions
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index a6b5573496..440f7cae9a 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.71 2002/08/28 21:03:45 jmayer Exp $ + * $Id: capture_dlg.c,v 1.72 2002/09/05 18:47:44 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -28,17 +28,9 @@ #ifdef HAVE_LIBPCAP -#include <stdlib.h> -#include <stdio.h> #include <string.h> #include <gtk/gtk.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#include <time.h> - #include <pcap.h> #include "capture.h" diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c index e90661337d..5b4da845fc 100644 --- a/gtk/capture_prefs.c +++ b/gtk/capture_prefs.c @@ -1,7 +1,7 @@ /* capture_prefs.c * Dialog box for capture preferences * - * $Id: capture_prefs.c,v 1.15 2002/08/31 14:22:11 jmayer Exp $ + * $Id: capture_prefs.c,v 1.16 2002/09/05 18:47:44 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -28,8 +28,6 @@ #ifdef HAVE_LIBPCAP -#include <string.h> -#include <errno.h> #include <gtk/gtk.h> #include <pcap.h> diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c index 693d0b3ea5..79a357e456 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.16 2002/08/28 21:03:46 jmayer Exp $ + * $Id: color_dlg.c,v 1.17 2002/09/05 18:47:44 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -28,11 +28,8 @@ #include <gtk/gtk.h> -#include <stdlib.h> #include <string.h> -#include <errno.h> - #include "gtk/main.h" #include <epan/packet.h> #include "colors.h" diff --git a/gtk/color_utils.c b/gtk/color_utils.c index 39e4bbc25c..ea360f87a8 100644 --- a/gtk/color_utils.c +++ b/gtk/color_utils.c @@ -2,7 +2,7 @@ * Utilities for converting between "toolkit-independent" and GDK * notions of color * - * $Id: color_utils.c,v 1.2 2002/08/28 21:03:46 jmayer Exp $ + * $Id: color_utils.c,v 1.3 2002/09/05 18:47:44 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -28,8 +28,6 @@ #include "config.h" #endif -#include <glib.h> - #include <gtk/gtk.h> #include "prefs.h" /* to declare "color_t" */ diff --git a/gtk/colors.c b/gtk/colors.c index 0aa4b5e119..8bfd232b1a 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.23 2002/08/28 21:03:46 jmayer Exp $ + * $Id: colors.c,v 1.24 2002/09/05 18:47:44 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -30,15 +30,10 @@ #include <gtk/gtk.h> -#include <stdlib.h> -#include <stdio.h> #include <string.h> -#include <errno.h> - #include <epan/filesystem.h> -#include "gtk/main.h" #include <epan/packet.h> #include "colors.h" #include "file.h" diff --git a/gtk/colors.h b/gtk/colors.h index d259c80420..1f309e8d71 100644 --- a/gtk/colors.h +++ b/gtk/colors.h @@ -1,7 +1,7 @@ /* colors.h * Definitions for color structures and routines * - * $Id: colors.h,v 1.8 2002/08/28 21:03:46 jmayer Exp $ + * $Id: colors.h,v 1.9 2002/09/05 18:47:45 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -24,11 +24,6 @@ #ifndef __COLORS_H__ #define __COLORS_H__ -#include <epan/proto.h> -#include <epan/dfilter/dfilter.h> -#include <gtk/gtk.h> -#include <epan/epan.h> - #define MAXCOLORS 255 #define MAX_COLOR_FILTER_NAME_LEN 33 #define MAX_COLOR_FILTER_STRING_LEN 256 diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c index 0c0780fe37..918e220c41 100644 --- a/gtk/column_prefs.c +++ b/gtk/column_prefs.c @@ -1,7 +1,7 @@ /* column_prefs.c * Dialog box for column preferences * - * $Id: column_prefs.c,v 1.12 2002/08/28 21:03:46 jmayer Exp $ + * $Id: column_prefs.c,v 1.13 2002/09/05 18:47:45 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,9 +26,7 @@ #include "config.h" #endif -#include <errno.h> #include <gtk/gtk.h> -#include <string.h> #include "globals.h" #include "column_prefs.h" diff --git a/gtk/column_prefs.h b/gtk/column_prefs.h index c3022e9552..7aa4860115 100644 --- a/gtk/column_prefs.h +++ b/gtk/column_prefs.h @@ -1,7 +1,7 @@ -/* gui_prefs.h +/* column_prefs.h * Definitions for column preferences window * - * $Id: column_prefs.h,v 1.3 2002/08/28 21:03:46 jmayer Exp $ + * $Id: column_prefs.h,v 1.4 2002/09/05 18:47:45 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -23,7 +23,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __COLUMN_PREFS_H__ +#define __COLUMN_PREFS_H__ + GtkWidget *column_prefs_show(void); void column_prefs_fetch(GtkWidget *); void column_prefs_apply(GtkWidget *); void column_prefs_destroy(GtkWidget *); + +#endif diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c index ce40e321b0..a800d531ec 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.25 2002/08/28 21:03:46 jmayer Exp $ + * $Id: decode_as_dlg.c,v 1.26 2002/09/05 18:47:45 jmayer Exp $ * * Routines to modify dissector tables on the fly. * @@ -28,12 +28,6 @@ #include <gtk/gtk.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> - -#include <errno.h> - #include "decode_as_dlg.h" #include "dlg_utils.h" #include "globals.h" diff --git a/gtk/decode_as_dlg.h b/gtk/decode_as_dlg.h index aa289b91c7..bb4c07f155 100644 --- a/gtk/decode_as_dlg.h +++ b/gtk/decode_as_dlg.h @@ -1,6 +1,6 @@ -/* decode_as_dlg.c +/* decode_as_dlg.h * - * $Id: decode_as_dlg.h,v 1.3 2002/08/28 21:03:46 jmayer Exp $ + * $Id: decode_as_dlg.h,v 1.4 2002/09/05 18:47:45 jmayer Exp $ * * Routines to modify dissector tables on the fly. * diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c index b661b2a73c..f8bf16107d 100644 --- a/gtk/dfilter_expr_dlg.c +++ b/gtk/dfilter_expr_dlg.c @@ -7,7 +7,7 @@ * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and * Guy Harris <guy@alum.mit.edu> * - * $Id: dfilter_expr_dlg.c,v 1.27 2002/08/28 21:03:46 jmayer Exp $ + * $Id: dfilter_expr_dlg.c,v 1.28 2002/09/05 18:47:45 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -44,9 +44,6 @@ #endif #include <gtk/gtk.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> #include <ctype.h> #ifdef NEED_SNPRINTF_H diff --git a/gtk/display_opts.c b/gtk/display_opts.c index 3772d59a82..4193c14297 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.29 2002/08/28 21:03:46 jmayer Exp $ + * $Id: display_opts.c,v 1.30 2002/09/05 18:47:45 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -28,20 +28,6 @@ #include <gtk/gtk.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#include <time.h> - -#ifdef HAVE_SYS_SOCKIO_H -# include <sys/sockio.h> -#endif - #include "globals.h" #include <epan/resolv.h> #include <epan/timestamp.h> diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index 3a268c0598..f90bb45d28 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.50 2002/08/28 21:03:47 jmayer Exp $ + * $Id: file_dlg.c,v 1.51 2002/09/05 18:47:45 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,17 +26,7 @@ #include "config.h" #endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#ifdef HAVE_DIRECT_H -#include <direct.h> -#endif - -#include <string.h> - -#include <glib.h> +#include <gtk/gtk.h> #include <epan/filesystem.h> diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c index 00de5fc244..5de63a337c 100644 --- a/gtk/find_dlg.c +++ b/gtk/find_dlg.c @@ -1,7 +1,7 @@ /* find_dlg.c * Routines for "find frame" window * - * $Id: find_dlg.c,v 1.23 2002/08/28 21:03:47 jmayer Exp $ + * $Id: find_dlg.c,v 1.24 2002/09/05 18:47:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -29,12 +29,6 @@ #include <gtk/gtk.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#include <glib.h> - #include <epan/proto.h> #include <epan/dfilter/dfilter.h> #include "globals.h" diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c index 4c9f8f56cf..bb3b8d0c85 100644 --- a/gtk/follow_dlg.c +++ b/gtk/follow_dlg.c @@ -1,6 +1,6 @@ /* follow_dlg.c * - * $Id: follow_dlg.c,v 1.25 2002/08/28 21:03:47 jmayer Exp $ + * $Id: follow_dlg.c,v 1.26 2002/09/05 18:47:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -27,16 +27,8 @@ #include <gtk/gtk.h> -#include <stdlib.h> -#include <stdio.h> #include <string.h> -#include <errno.h> - -#ifdef HAVE_SYS_STAT_H -#include <sys/stat.h> -#endif - #ifdef HAVE_IO_H #include <io.h> /* open/close on win32 */ #endif diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c index fb7ea759f9..3ad277e326 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.16 2002/08/28 21:03:47 jmayer Exp $ + * $Id: goto_dlg.c,v 1.17 2002/09/05 18:47:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -29,14 +29,6 @@ #include <gtk/gtk.h> -#include <stdlib.h> - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#include <glib.h> - #include <epan/proto.h> #include "globals.h" diff --git a/gtk/gtkglobals.h b/gtk/gtkglobals.h index a8f6aa9e7f..c8d4c713fa 100644 --- a/gtk/gtkglobals.h +++ b/gtk/gtkglobals.h @@ -1,7 +1,7 @@ /* gtkglobals.h * GTK-related Global defines, etc. * - * $Id: gtkglobals.h,v 1.18 2002/08/28 21:03:48 jmayer Exp $ + * $Id: gtkglobals.h,v 1.19 2002/09/05 18:47:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -25,10 +25,6 @@ #ifndef __GTKGLOBALS_H__ #define __GTKGLOBALS_H__ -#ifndef __GTK_H__ -#include <gtk/gtk.h> -#endif - extern GtkWidget *top_level, *packet_list, *tree_view, *byte_nb_ptr; extern GdkFont *m_r_font, *m_b_font; extern guint m_font_height, m_font_width; diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c index b61c6347cd..0657901307 100644 --- a/gtk/gui_prefs.c +++ b/gtk/gui_prefs.c @@ -1,7 +1,7 @@ /* gui_prefs.c * Dialog box for GUI preferences * - * $Id: gui_prefs.c,v 1.35 2002/08/28 21:03:48 jmayer Exp $ + * $Id: gui_prefs.c,v 1.36 2002/09/05 18:47:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,7 +26,6 @@ #include "config.h" #endif -#include <errno.h> #include <gtk/gtk.h> #include "color.h" diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c index 4ac71b4cb3..40947fadc6 100644 --- a/gtk/help_dlg.c +++ b/gtk/help_dlg.c @@ -1,6 +1,6 @@ /* help_dlg.c * - * $Id: help_dlg.c,v 1.24 2002/08/28 21:03:48 jmayer Exp $ + * $Id: help_dlg.c,v 1.25 2002/09/05 18:47:46 jmayer Exp $ * * Laurent Deniel <deniel@worldnet.fr> * @@ -28,9 +28,6 @@ #endif #include <gtk/gtk.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> #ifdef NEED_SNPRINTF_H # include "snprintf.h" diff --git a/gtk/main.c b/gtk/main.c index 5992e669ec..16ba041c25 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.259 2002/08/28 21:03:48 jmayer Exp $ + * $Id: main.c,v 1.260 2002/09/05 18:47:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -41,31 +41,13 @@ #include <gtk/gtk.h> -#include <stdlib.h> -#include <stdio.h> #include <string.h> #include <ctype.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#include <errno.h> - -#ifdef HAVE_SYS_STAT_H -#include <sys/stat.h> -#endif - #ifdef HAVE_IO_H #include <io.h> /* open/close on win32 */ #endif -#ifdef HAVE_DIRECT_H -#include <direct.h> -#endif - -#include <signal.h> - #ifdef HAVE_LIBPCAP #include <pcap.h> #endif diff --git a/gtk/menu.c b/gtk/menu.c index 75efbf876c..e8861c8a56 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -1,7 +1,7 @@ /* menu.c * Menu routines * - * $Id: menu.c,v 1.66 2002/08/28 21:03:48 jmayer Exp $ + * $Id: menu.c,v 1.67 2002/09/05 18:47:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -27,10 +27,8 @@ #endif #include <gtk/gtk.h> -#include <glib.h> #include <string.h> -#include <stdio.h> #include "../menu.h" diff --git a/gtk/nameres_prefs.c b/gtk/nameres_prefs.c index 8af3f92d76..2953d74f8b 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.5 2002/08/28 21:03:48 jmayer Exp $ + * $Id: nameres_prefs.c,v 1.6 2002/09/05 18:47:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,8 +26,6 @@ #include "config.h" #endif -#include <string.h> -#include <errno.h> #include <gtk/gtk.h> #include "globals.h" diff --git a/gtk/packet_win.c b/gtk/packet_win.c index 5a8e3ce0a7..37ac73b0e8 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.39 2002/08/28 21:03:48 jmayer Exp $ + * $Id: packet_win.c,v 1.40 2002/09/05 18:47:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -37,14 +37,8 @@ #include <gtk/gtk.h> -#include <stdlib.h> -#include <stdio.h> #include <string.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - #include <epan/epan.h> #include "main.h" #include <epan/timestamp.h> diff --git a/gtk/plugins_dlg.c b/gtk/plugins_dlg.c index 92725c71d9..77400eceaa 100644 --- a/gtk/plugins_dlg.c +++ b/gtk/plugins_dlg.c @@ -1,7 +1,7 @@ /* plugins_dlg.c * Dialog boxes for plugins * - * $Id: plugins_dlg.c,v 1.25 2002/08/02 22:34:54 jmayer Exp $ + * $Id: plugins_dlg.c,v 1.26 2002/09/05 18:47:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,10 +26,6 @@ #include "config.h" #endif -#include <errno.h> - -#include <stdlib.h> -#include <string.h> #include <gtk/gtk.h> #include "globals.h" diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index 334fe1a357..10d32a7def 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.52 2002/08/28 21:03:49 jmayer Exp $ + * $Id: prefs_dlg.c,v 1.53 2002/09/05 18:47:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -28,18 +28,7 @@ #include <gtk/gtk.h> -#include <stdlib.h> #include <string.h> -#include <ctype.h> -#include <errno.h> - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#ifdef HAVE_SYS_STAT_H -#include <sys/stat.h> -#endif #include <epan/filesystem.h> diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c index a7402c6ae1..1b6ab11e77 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.35 2002/08/28 21:03:49 jmayer Exp $ + * $Id: print_dlg.c,v 1.36 2002/09/05 18:47:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,8 +26,6 @@ #include "config.h" #endif -#include <errno.h> - #include <gtk/gtk.h> #include "globals.h" diff --git a/gtk/print_mswin.c b/gtk/print_mswin.c index 6b5f0a857f..20ec2d337c 100644 --- a/gtk/print_mswin.c +++ b/gtk/print_mswin.c @@ -33,8 +33,6 @@ #include <winspool.h> #endif -#include <stdio.h> - BOOL CALLBACK abort_proc( HDC hDC, int Error ); HDC get_printer_dc(void); void init_doc_struct( DOCINFO* di, char* docname); diff --git a/gtk/print_mswin.h b/gtk/print_mswin.h index a7159e46c6..f714f4f5ec 100644 --- a/gtk/print_mswin.h +++ b/gtk/print_mswin.h @@ -22,6 +22,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - +#ifndef __PRINT_MSWIN_H__ +#define __PRINT_MSWIN_H__ void print_mswin(char *file_name); + +#endif diff --git a/gtk/progress_dlg.c b/gtk/progress_dlg.c index 49cc0e6154..28eb6c97c0 100644 --- a/gtk/progress_dlg.c +++ b/gtk/progress_dlg.c @@ -1,7 +1,7 @@ /* progress_dlg.c * Routines for progress-bar (modal) dialog * - * $Id: progress_dlg.c,v 1.14 2002/08/28 22:28:43 guy Exp $ + * $Id: progress_dlg.c,v 1.15 2002/09/05 18:47:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,6 +26,7 @@ # include "config.h" #endif +#include <gtk/gtk.h> #include "gtkglobals.h" #include "dlg_utils.h" #include "progress_dlg.h" diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c index b66863fd6b..8330893146 100644 --- a/gtk/proto_dlg.c +++ b/gtk/proto_dlg.c @@ -1,6 +1,6 @@ /* proto_dlg.c * - * $Id: proto_dlg.c,v 1.13 2002/08/28 21:03:49 jmayer Exp $ + * $Id: proto_dlg.c,v 1.14 2002/09/05 18:47:47 jmayer Exp $ * * Laurent Deniel <deniel@worldnet.fr> * @@ -28,9 +28,6 @@ #endif #include <gtk/gtk.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> #include "prefs.h" #include "globals.h" diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c index 0d06c78e54..d7424bf94f 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.57 2002/08/28 21:03:49 jmayer Exp $ + * $Id: proto_draw.c,v 1.58 2002/09/05 18:47:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -30,14 +30,10 @@ #endif #include <ctype.h> -#include <stdarg.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#include <stdio.h> -#include <string.h> - #include <epan/epan_dissect.h> #include "main.h" diff --git a/gtk/proto_hier_stats_dlg.h b/gtk/proto_hier_stats_dlg.h index dc124ffec1..c0a520a230 100644 --- a/gtk/proto_hier_stats_dlg.h +++ b/gtk/proto_hier_stats_dlg.h @@ -1,6 +1,6 @@ /* proto_hier_stats_dlg.h * - * $Id: proto_hier_stats_dlg.h,v 1.1 2001/03/22 23:54:47 gram Exp $ + * $Id: proto_hier_stats_dlg.h,v 1.2 2002/09/05 18:47:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -22,6 +22,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __PROTO_HIER_STATS_DLG_H__ +#define __PROTO_HIER_STATS_DLG_H__ void proto_hier_stats_cb(GtkWidget *w, gpointer d); + +#endif diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c index 5be59e3d69..a38752590f 100644 --- a/gtk/simple_dialog.c +++ b/gtk/simple_dialog.c @@ -1,7 +1,7 @@ /* simple_dialog.c * Simple message dialog box routines. * - * $Id: simple_dialog.c,v 1.11 2002/08/28 21:03:49 jmayer Exp $ + * $Id: simple_dialog.c,v 1.12 2002/09/05 18:47:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -27,11 +27,8 @@ # include "config.h" #endif -#include <glib.h> - #include <gtk/gtk.h> -#include <stdarg.h> #include <stdio.h> #ifdef NEED_SNPRINTF_H diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c index ffe09028ee..6c4cdb83f7 100644 --- a/gtk/stream_prefs.c +++ b/gtk/stream_prefs.c @@ -1,7 +1,7 @@ /* stream_prefs.c * Dialog boxes for preferences for the stream window * - * $Id: stream_prefs.c,v 1.12 2002/08/28 21:03:49 jmayer Exp $ + * $Id: stream_prefs.c,v 1.13 2002/09/05 18:47:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,7 +26,6 @@ #include "config.h" #endif -#include <errno.h> #include <gtk/gtk.h> #include "color.h" diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c index 235ecd83d5..996242257c 100644 --- a/gtk/summary_dlg.c +++ b/gtk/summary_dlg.c @@ -1,7 +1,7 @@ /* summary_dlg.c * Routines for capture file summary window * - * $Id: summary_dlg.c,v 1.14 2002/08/31 00:40:46 gerald Exp $ + * $Id: summary_dlg.c,v 1.15 2002/09/05 18:47:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -30,8 +30,6 @@ #include <gtk/gtk.h> -#include <stdio.h> -#include <string.h> #include <wtap.h> #ifdef NEED_SNPRINTF_H diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index 7c816867f9..88139e63b5 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.20 2002/08/28 21:03:49 jmayer Exp $ + * $Id: tcp_graph.c,v 1.21 2002/09/05 18:47:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -30,8 +30,6 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#include <stdio.h> -#include <string.h> #include <math.h> /* rint() */ #ifdef NEED_SNPRINTF_H diff --git a/gtk/tcp_graph.h b/gtk/tcp_graph.h index c9e5374221..10743bf11e 100644 --- a/gtk/tcp_graph.h +++ b/gtk/tcp_graph.h @@ -3,7 +3,7 @@ * By Pavel Mores <pvl@uh.cz> * Win32 port: rwh@unifiedtech.com * - * $Id: tcp_graph.h,v 1.2 2002/08/28 21:03:50 jmayer Exp $ + * $Id: tcp_graph.h,v 1.3 2002/09/05 18:47:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -24,4 +24,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __TCP_GRAPH_H__ +#define __TCP_GRAPH_H__ + extern void tcp_graph_cb (GtkWidget *, gpointer, guint); + +#endif diff --git a/gtk/ui_util.c b/gtk/ui_util.c index 6327f245ea..a568996e0a 100644 --- a/gtk/ui_util.c +++ b/gtk/ui_util.c @@ -1,7 +1,7 @@ /* ui_util.c * UI utility routines * - * $Id: ui_util.c,v 1.10 2002/08/28 21:03:50 jmayer Exp $ + * $Id: ui_util.c,v 1.11 2002/09/05 18:47:48 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,8 +26,6 @@ # include "config.h" #endif -#include <glib.h> - #include <gtk/gtk.h> #include "gtkglobals.h" |