osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

More shuffling of GTK-related files to gtk subdirectory. 

svn path=/trunk/; revision=635
This commit is contained in:
Gilbert Ramirez 1999-09-09 02:42:40 +00:00
parent 28009b86d2
commit 3c49e45cf7
16 changed files with 35 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -22,8 +22,6 @@ ethereal_SOURCES = \
dfilter.h \ dfilter.h \
display.c \ display.c \
display.h \ display.h \
ethereal.c \
ethereal.h \
ethertype.c \ ethertype.c \
etypes.h \ etypes.h \
file.c \ file.c \
@ -33,8 +31,6 @@ ethereal_SOURCES = \
follow.c \ follow.c \
follow.h \ follow.h \
globals.h \ globals.h \
gtkpacket.c \
gtkpacket.h \
packet-aarp.c \ packet-aarp.c \
packet-arp.c \ packet-arp.c \
packet-atalk.c \ packet-atalk.c \

4
capture.c
View File

@ -1,7 +1,7 @@
/* capture.c /* capture.c
* Routines for packet capture windows * Routines for packet capture windows
* *
* $Id: capture.c,v 1.64 1999/09/08 05:41:25 guy Exp $ * $Id: capture.c,v 1.65 1999/09/09 02:42:22 gram Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -77,7 +77,7 @@
# include <sys/sockio.h> # include <sys/sockio.h>
#endif #endif
#include "ethereal.h" #include "gtk/main.h"
#include "packet.h" #include "packet.h"
#include "file.h" #include "file.h"
#include "gtk/menu.h" #include "gtk/menu.h"

4
colors.c
View File

@ -1,7 +1,7 @@
/* colors.c /* colors.c
* Definitions for color structures and routines * Definitions for color structures and routines
* *
* $Id: colors.c,v 1.6 1999/08/28 23:47:41 gram Exp $ * $Id: colors.c,v 1.7 1999/09/09 02:42:23 gram Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -36,7 +36,7 @@
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>
#include "ethereal.h" #include "gtk/main.h"
#include "packet.h" #include "packet.h"
#include "colors.h" #include "colors.h"
#include "file.h" #include "file.h"

6
file.c
View File

@ -1,7 +1,7 @@
/* file.c /* file.c
* File I/O routines * File I/O routines
* *
* $Id: file.c,v 1.86 1999/09/01 03:04:10 gram Exp $ * $Id: file.c,v 1.87 1999/09/09 02:42:24 gram Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -68,14 +68,14 @@
# include <netinet/in.h> # include <netinet/in.h>
#endif #endif
#include "ethereal.h" #include "gtk/main.h"
#include "column.h" #include "column.h"
#include "gtk/menu.h" #include "gtk/menu.h"
#include "packet.h" #include "packet.h"
#include "print.h" #include "print.h"
#include "file.h" #include "file.h"
#include "util.h" #include "util.h"
#include "gtkpacket.h" #include "gtk/proto_draw.h"
#include "dfilter.h" #include "dfilter.h"
#include "timestamp.h" #include "timestamp.h"

4
filter.c
View File

@ -1,7 +1,7 @@
/* filter.c /* filter.c
* Routines for managing filter sets * Routines for managing filter sets
* *
* $Id: filter.c,v 1.15 1999/09/01 03:04:11 gram Exp $ * $Id: filter.c,v 1.16 1999/09/09 02:42:25 gram Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -40,7 +40,7 @@
#include <direct.h> #include <direct.h>
#endif #endif
#include "ethereal.h" #include "gtk/main.h"
#include "filter.h" #include "filter.h"
#include "packet.h" #include "packet.h"
#include "file.h" #include "file.h"

4
follow.c
View File

@ -1,6 +1,6 @@
/* follow.c /* follow.c
* *
* $Id: follow.c,v 1.14 1999/07/31 13:55:16 deniel Exp $ * $Id: follow.c,v 1.15 1999/09/09 02:42:25 gram Exp $
* *
* Copyright 1998 Mike Hall <mlh@io.com> * Copyright 1998 Mike Hall <mlh@io.com>
* *
@ -42,7 +42,7 @@
#endif #endif
#include <glib.h> #include <glib.h>
#include "ethereal.h" #include "gtk/main.h"
#include "packet.h" #include "packet.h"
#include "follow.h" #include "follow.h"

6
gtk/Makefile.am
View File

@ -12,8 +12,12 @@ libui_a_SOURCES = \
gtkdnd.h \ gtkdnd.h \
gtkmain.h \ gtkmain.h \
keys.h \ keys.h \
main.c \
main.h \
menu.c \ menu.c \
menu.h \ menu.h \
print_dlg.c \ print_dlg.c \
print_prefs.c \ print_prefs.c \
print_prefs.h print_prefs.h \
proto_draw.c \
proto_draw.h

10
ethereal.c → gtk/main.c
View File

@ -1,6 +1,6 @@
/* ethereal.c /* ethereal.c
* *
* $Id: ethereal.c,v 1.110 1999/09/01 03:04:09 gram Exp $ * $Id: main.c,v 1.1 1999/09/09 02:42:39 gram Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -79,22 +79,22 @@
#include "strerror.h" #include "strerror.h"
#endif #endif
#include "ethereal.h" #include "main.h"
#include "timestamp.h" #include "timestamp.h"
#include "packet.h" #include "packet.h"
#include "capture.h" #include "capture.h"
#include "summary.h" #include "summary.h"
#include "file.h" #include "file.h"
#include "gtk/menu.h" #include "menu.h"
#include "prefs.h" #include "prefs.h"
#include "column.h" #include "column.h"
#include "print.h" #include "print.h"
#include "resolv.h" #include "resolv.h"
#include "follow.h" #include "follow.h"
#include "util.h" #include "util.h"
#include "gtkpacket.h" #include "proto_draw.h"
#include "dfilter.h" #include "dfilter.h"
#include "gtk/keys.h" #include "keys.h"
FILE *data_out_file = NULL; FILE *data_out_file = NULL;
packet_info pi; packet_info pi;

12
ethereal.h → gtk/main.h
View File

@ -1,7 +1,7 @@
/* ethereal.h /* ethereal.h
* Global defines, etc. * Global defines, etc.
* *
* $Id: ethereal.h,v 1.23 1999/08/28 01:51:58 guy Exp $ * $Id: main.h,v 1.1 1999/09/09 02:42:40 gram Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -62,16 +62,6 @@
#define BYTE_ORDER LITTLE_ENDIAN #define BYTE_ORDER LITTLE_ENDIAN
#endif #endif
#endif #endif
/* From the K&R book, p. 89 */
#ifndef MAX
#define MAX(x, y) ((x) > (y) ? (x) : (y))
#endif
#ifndef MIN
#define MIN(x, y) ((x) < (y) ? (x) : (y))
#endif
typedef struct _selection_info { typedef struct _selection_info {
GtkWidget *tree; GtkWidget *tree;

4
gtk/menu.c
View File

@ -1,7 +1,7 @@
/* menu.c /* menu.c
* Menu routines * Menu routines
* *
* $Id: menu.c,v 1.1 1999/09/01 03:04:23 gram Exp $ * $Id: menu.c,v 1.2 1999/09/09 02:42:40 gram Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -36,7 +36,7 @@
# include <sys/types.h> # include <sys/types.h>
#endif #endif
#include "ethereal.h" #include "main.h"
#include "menu.h" #include "menu.h"
#include "packet.h" #include "packet.h"
#include "capture.h" #include "capture.h"

8
gtkpacket.c → gtk/proto_draw.c
View File

@ -1,7 +1,7 @@
/* gtkpacket.c /* gtkpacket.c
* Routines for GTK+ packet display * Routines for GTK+ packet display
* *
* $Id: gtkpacket.c,v 1.6 1999/07/07 22:51:39 gram Exp $ * $Id: proto_draw.c,v 1.1 1999/09/09 02:42:40 gram Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -41,12 +41,10 @@
#endif #endif
#include <stdio.h> #include <stdio.h>
#include "ethereal.h" #include "main.h"
#include "packet.h" #include "packet.h"
#ifndef __GTKPACKET_H__ #include "proto_draw.h"
#include "gtkpacket.h"
#endif
#define BYTE_VIEW_WIDTH 16 #define BYTE_VIEW_WIDTH 16
#define BYTE_VIEW_SEP 8 #define BYTE_VIEW_SEP 8

2
gtkpacket.h → gtk/proto_draw.h
View File

@ -1,7 +1,7 @@
/* gtkpacket.h /* gtkpacket.h
* Definitions for GTK+ packet display structures and routines * Definitions for GTK+ packet display structures and routines
* *
* $Id: gtkpacket.h,v 1.2 1999/07/07 22:51:39 gram Exp $ * $Id: proto_draw.h,v 1.1 1999/09/09 02:42:40 gram Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>

4
prefs.c
View File

@ -1,7 +1,7 @@
/* prefs.c /* prefs.c
* Routines for handling preferences * Routines for handling preferences
* *
* $Id: prefs.c,v 1.20 1999/09/01 03:04:12 gram Exp $ * $Id: prefs.c,v 1.21 1999/09/09 02:42:25 gram Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -47,7 +47,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "ethereal.h" #include "gtk/main.h"
#include "packet.h" #include "packet.h"
#include "file.h" #include "file.h"
#include "prefs.h" #include "prefs.h"

3
print.c
View File

@ -1,7 +1,7 @@
/* print.c /* print.c
* Routines for printing packet analysis trees. * Routines for printing packet analysis trees.
* *
* $Id: print.c,v 1.17 1999/09/01 03:04:12 gram Exp $ * $Id: print.c,v 1.18 1999/09/09 02:42:25 gram Exp $
* *
* Gilbert Ramirez <gram@verdict.uthscsa.edu> * Gilbert Ramirez <gram@verdict.uthscsa.edu>
* *
@ -37,7 +37,6 @@
# include <sys/types.h> # include <sys/types.h>
#endif #endif
/*#include "ethereal.h"*/
#include "packet.h" #include "packet.h"
#include "prefs.h" #include "prefs.h"
#include "print.h" #include "print.h"

4
resolv.c
View File

@ -1,7 +1,7 @@
/* resolv.c /* resolv.c
* Routines for network object lookup * Routines for network object lookup
* *
* $Id: resolv.c,v 1.8 1999/07/13 02:52:58 gram Exp $ * $Id: resolv.c,v 1.9 1999/09/09 02:42:26 gram Exp $
* *
* Laurent Deniel <deniel@worldnet.fr> * Laurent Deniel <deniel@worldnet.fr>
* *
@ -67,7 +67,7 @@
# include <setjmp.h> # include <setjmp.h>
#endif #endif
#include "ethereal.h" #include "gtk/main.h"
#include "packet.h" #include "packet.h"
#include "packet-ipv6.h" #include "packet-ipv6.h"
#include "resolv.h" #include "resolv.h"

4
summary.c
View File

@ -1,7 +1,7 @@
/* summary.c /* summary.c
* Routines for capture file summary window * Routines for capture file summary window
* *
* $Id: summary.c,v 1.11 1999/09/01 03:04:12 gram Exp $ * $Id: summary.c,v 1.12 1999/09/09 02:42:26 gram Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -55,7 +55,7 @@
# include <sys/sockio.h> # include <sys/sockio.h>
#endif #endif
#include "ethereal.h" #include "gtk/main.h"
#include "packet.h" #include "packet.h"
#include "file.h" #include "file.h"
#include "summary.h" #include "summary.h"