More shuffling of GTK-related files to gtk subdirectory.

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

diff --git a/Makefile.am b/Makefile.am
index b6f7d72cad39370deddc764628647289054e31cf..9a5108c4f3fc9e33b6a521b74099e97eb2379091 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,8 +22,6 @@ ethereal_SOURCES = \
        dfilter.h      \
        display.c      \
        display.h      \
-       ethereal.c     \
-       ethereal.h     \
        ethertype.c    \
        etypes.h       \
        file.c         \
@@ -33,8 +31,6 @@ ethereal_SOURCES = \
        follow.c       \
        follow.h       \
        globals.h      \
-       gtkpacket.c    \
-       gtkpacket.h    \
        packet-aarp.c  \
        packet-arp.c   \
        packet-atalk.c \

diff --git a/capture.c b/capture.c
index 6a95d4503a582f903ac511e1a02e31e4c3ffc12f..0d4358429c4dc6b5c3ee29ba020a4dfc0b5f7a0e 100644 (file)
--- a/capture.c
+++ b/capture.c
@@ -1,7 +1,7 @@
 /* capture.c
  * 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
  * By Gerald Combs <gerald@zing.org>
@@ -77,7 +77,7 @@
 # include <sys/sockio.h>
 #endif
 
-#include "ethereal.h"
+#include "gtk/main.h"
 #include "packet.h"
 #include "file.h"
 #include "gtk/menu.h"

diff --git a/colors.c b/colors.c
index 4409707c8fee05064a8acb69035aa54a0cd9e4d2..be786baa555da0bb8d4847f0d52225993db96091 100644 (file)
--- a/colors.c
+++ b/colors.c
@@ -1,7 +1,7 @@
 /* colors.c
  * 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
  * By Gerald Combs <gerald@zing.org>
@@ -36,7 +36,7 @@
 #include <errno.h>
 #include <sys/types.h>
 
-#include "ethereal.h"
+#include "gtk/main.h"
 #include "packet.h"
 #include "colors.h"
 #include "file.h"

diff --git a/file.c b/file.c
index 0cee4f2d09355dfecddf6982469abf2238a3f81e..3ce06f97761d04df03948fe5e0022c4ffe6cebfa 100644 (file)
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
 /* file.c
  * 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
  * By Gerald Combs <gerald@zing.org>
@@ -68,14 +68,14 @@
 # include <netinet/in.h>
 #endif
 
-#include "ethereal.h"
+#include "gtk/main.h"
 #include "column.h"
 #include "gtk/menu.h"
 #include "packet.h"
 #include "print.h"
 #include "file.h"
 #include "util.h"
-#include "gtkpacket.h"
+#include "gtk/proto_draw.h"
 #include "dfilter.h"
 #include "timestamp.h"
 

diff --git a/filter.c b/filter.c
index 330296b90ea405ebecad3150b1da216e02a7145a..50a4cc46d72236d60d6656919235f94ab0d0495c 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -1,7 +1,7 @@
 /* filter.c
  * 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
  * By Gerald Combs <gerald@zing.org>
@@ -40,7 +40,7 @@
 #include <direct.h>
 #endif
 
-#include "ethereal.h"
+#include "gtk/main.h"
 #include "filter.h"
 #include "packet.h"
 #include "file.h"

diff --git a/follow.c b/follow.c
index 850737c01ae8615c8806db5acefc15f60f4e0b83..215c677abc46b33c73f73369381f27da58f8bd04 100644 (file)
--- a/follow.c
+++ b/follow.c
@@ -1,6 +1,6 @@
 /* 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>
  *
@@ -42,7 +42,7 @@
 #endif
 
 #include <glib.h>
-#include "ethereal.h"
+#include "gtk/main.h"
 #include "packet.h"
 #include "follow.h"
 

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 50241b3c5a8cc07fbc62fff29bee7dab7bd07dae..0db778dea6d02a8743c4a8ac55efccb1d8bd8433 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -12,8 +12,12 @@ libui_a_SOURCES = \
        gtkdnd.h        \
        gtkmain.h       \
        keys.h          \
+       main.c          \
+       main.h          \
        menu.c          \
        menu.h          \
        print_dlg.c     \
        print_prefs.c   \
-       print_prefs.h
+       print_prefs.h   \
+       proto_draw.c    \
+       proto_draw.h

diff --git a/ethereal.c b/gtk/main.c
similarity index 99%
rename from ethereal.c
rename to gtk/main.c
index aedba45b5546c74f284881e239e4708913267f30..a8f80a555d9db519f4abed30428a16fe57b6b041 100644 (file)
--- a/ethereal.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
 /* 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
  * By Gerald Combs <gerald@zing.org>
@@ -79,22 +79,22 @@
 #include "strerror.h"
 #endif
 
-#include "ethereal.h"
+#include "main.h"
 #include "timestamp.h"
 #include "packet.h"
 #include "capture.h"
 #include "summary.h"
 #include "file.h"
-#include "gtk/menu.h"
+#include "menu.h"
 #include "prefs.h"
 #include "column.h"
 #include "print.h"
 #include "resolv.h"
 #include "follow.h"
 #include "util.h"
-#include "gtkpacket.h"
+#include "proto_draw.h"
 #include "dfilter.h"
-#include "gtk/keys.h"
+#include "keys.h"
 
 FILE        *data_out_file = NULL;
 packet_info  pi;

diff --git a/ethereal.h b/gtk/main.h
similarity index 92%
rename from ethereal.h
rename to gtk/main.h
index 049bc7380c654f20a21455763ffac2e8a442c64f..ba314ef30f5f96833b2d5687018f108c210d6cc7 100644 (file)
--- a/ethereal.h
+++ b/gtk/main.h
@@ -1,7 +1,7 @@
 /* ethereal.h
  * 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
  * By Gerald Combs <gerald@zing.org>
@@ -62,16 +62,6 @@
     #define BYTE_ORDER LITTLE_ENDIAN
   #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 {
   GtkWidget *tree;

diff --git a/gtk/menu.c b/gtk/menu.c
index 97a37883d1ed30df86f6753f61246436a8dbbec6..7bd8089958c3c2eac9156f9d86a462d5b2fd16b0 100644 (file)
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * 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
  * By Gerald Combs <gerald@zing.org>
@@ -36,7 +36,7 @@
 # include <sys/types.h>
 #endif
 
-#include "ethereal.h"
+#include "main.h"
 #include "menu.h"
 #include "packet.h"
 #include "capture.h"

diff --git a/gtkpacket.c b/gtk/proto_draw.c
similarity index 97%
rename from gtkpacket.c
rename to gtk/proto_draw.c
index 2b81e5d6d7498fb7c1409b46a86b1cb446972a5a..80f53bc5342c4d2861c0512ae33b5578f14644b7 100644 (file)
--- a/gtkpacket.c
+++ b/gtk/proto_draw.c
@@ -1,7 +1,7 @@
 /* gtkpacket.c
  * 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
  * By Gerald Combs <gerald@zing.org>
@@ -41,12 +41,10 @@
 #endif
 
 #include <stdio.h>
-#include "ethereal.h"
+#include "main.h"
 #include "packet.h"
 
-#ifndef __GTKPACKET_H__
-#include "gtkpacket.h"
-#endif
+#include "proto_draw.h"
 
 #define BYTE_VIEW_WIDTH    16
 #define BYTE_VIEW_SEP      8

diff --git a/gtkpacket.h b/gtk/proto_draw.h
similarity index 95%
rename from gtkpacket.h
rename to gtk/proto_draw.h
index 3344aa9fe39dc88f9c34701c30dbbab2a89b3991..e2f95fa500a3c1e0b183cf8aa2d2019b658ee08e 100644 (file)
--- a/gtkpacket.h
+++ b/gtk/proto_draw.h
@@ -1,7 +1,7 @@
 /* gtkpacket.h
  * 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
  * By Gerald Combs <gerald@zing.org>

diff --git a/prefs.c b/prefs.c
index cf2f55966c7281a950eb25b8abbb25c5d58b5a68..978835d10c1707045800a1951b33142fb03b9078 100644 (file)
--- a/prefs.c
+++ b/prefs.c
@@ -1,7 +1,7 @@
 /* prefs.c
  * 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
  * By Gerald Combs <gerald@zing.org>
@@ -47,7 +47,7 @@
 
 #include <sys/stat.h>
 
-#include "ethereal.h"
+#include "gtk/main.h"
 #include "packet.h"
 #include "file.h"
 #include "prefs.h"

diff --git a/print.c b/print.c
index 0d0ecd3d02d6f1addb2c7607602db96603232e15..809cecf3be5cd868117f48522dc12f7b65d95781 100644 (file)
--- a/print.c
+++ b/print.c
@@ -1,7 +1,7 @@
 /* print.c
  * 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>
  *
@@ -37,7 +37,6 @@
 # include <sys/types.h>
 #endif
 
-/*#include "ethereal.h"*/
 #include "packet.h"
 #include "prefs.h"
 #include "print.h"

diff --git a/resolv.c b/resolv.c
index f0eb2029e14f587e2cec3a188c014d2dd2d549f3..7900f6f9037b144aebc63ce22ad0f88b904a5480 100644 (file)
--- a/resolv.c
+++ b/resolv.c
@@ -1,7 +1,7 @@
 /* resolv.c
  * 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>
  *
@@ -67,7 +67,7 @@
 # include <setjmp.h>
 #endif
 
-#include "ethereal.h"
+#include "gtk/main.h"
 #include "packet.h"
 #include "packet-ipv6.h"
 #include "resolv.h"

diff --git a/summary.c b/summary.c
index 202a83c09cd464689301f9c8765cae19a7aea7c8..9375ce8bd17cf18ef28bf51098403275cc6631ed 100644 (file)
--- a/summary.c
+++ b/summary.c
@@ -1,7 +1,7 @@
 /* summary.c
  * 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
  * By Gerald Combs <gerald@zing.org>
@@ -55,7 +55,7 @@
 # include <sys/sockio.h>
 #endif
 
-#include "ethereal.h"
+#include "gtk/main.h"
 #include "packet.h"
 #include "file.h"
 #include "summary.h"