From d4b591b7dde96261093dca869e495adc5f6d39c9 Mon Sep 17 00:00:00 2001
From: Ulf Lamping <ulf.lamping@web.de>
Date: Wed, 21 Jan 2004 19:21:28 +0000
Subject: [PATCH] display_opts.c / .h no longer needed, all items moved to
 menuitems

svn path=/trunk/; revision=9770
---
 gtk/Makefile.am    | 6 +-----
 gtk/Makefile.nmake | 3 +--
 gtk/menu.c         | 3 +--
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 11169bcca5..35bb140558 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for the GTK interface routines for Ethereal
 #
-# $Id: Makefile.am,v 1.86 2004/01/19 00:42:09 ulfl Exp $
+# $Id: Makefile.am,v 1.87 2004/01/21 19:21:28 ulfl Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -84,8 +84,6 @@ libui_a_SOURCES = \
 	decode_as_dlg.h	\
 	dfilter_expr_dlg.c \
 	dfilter_expr_dlg.h \
-	display_opts.c	\
-	display_opts.h	\
 	dlg_utils.c	\
 	dlg_utils.h	\
 	endpoint_talkers_table.c \
@@ -179,8 +177,6 @@ libui_a_SOURCES = \
 	decode_as_dlg.h	\
 	dfilter_expr_dlg.c \
 	dfilter_expr_dlg.h \
-	display_opts.c	\
-	display_opts.h	\
 	dlg_utils.c	\
 	dlg_utils.h	\
 	endpoint_talkers_table.c \
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 9d3b585e49..4aff36bfaf 100644
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.70 2004/01/19 00:42:10 ulfl Exp $
+# $Id: Makefile.nmake,v 1.71 2004/01/21 19:21:28 ulfl Exp $
 
 include ..\config.nmake
 
@@ -65,7 +65,6 @@ OBJECTS = \
 	color_utils.obj  \
 	decode_as_dlg.obj \
 	dfilter_expr_dlg.obj \
-	display_opts.obj \
 	dlg_utils.obj	\
 	endpoint_talkers_table.obj \
 	ethereal-tap-register.obj \
diff --git a/gtk/menu.c b/gtk/menu.c
index a2abffe126..a38cbe4cad 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * Menu routines
  *
- * $Id: menu.c,v 1.142 2004/01/21 06:41:03 ulfl Exp $
+ * $Id: menu.c,v 1.143 2004/01/21 19:21:28 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -43,7 +43,6 @@
 #include "find_dlg.h"
 #include "goto_dlg.h"
 #include "summary_dlg.h"
-#include "display_opts.h"
 #include "prefs_dlg.h"
 #include "packet_win.h"
 #include "print.h"