From ed5651a90939c40d1ca64a0b0e67b89b8031da21 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Wed, 5 Jul 2000 06:33:02 +0000
Subject: [PATCH] Get rid of the stuff to let the callback that pops up the
 Preferences dialog select a particular page - I think that was used only by
 the filter code back when "Filter:" buttons popped up a Preferences dialog
 with the Filter page (which is no longer a Preferences dialog page) selected,
 but now there's a separate Filter dialog box.

svn path=/trunk/; revision=2116
---
 gtk/menu.c      |  4 ++--
 gtk/prefs_dlg.c | 10 ++--------
 gtk/prefs_dlg.h |  8 +-------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/gtk/menu.c b/gtk/menu.c
index 8ae7ff36db..91ef29d834 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * Menu routines
  *
- * $Id: menu.c,v 1.30 2000/05/02 07:44:37 guy Exp $
+ * $Id: menu.c,v 1.31 2000/07/05 06:33:01 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -109,7 +109,7 @@ static GtkItemFactoryEntry menu_items[] =
   {"/Edit/_Find Frame...", "<control>F", GTK_MENU_FUNC(find_frame_cb), 0, NULL},
   {"/Edit/_Go To Frame...", "<control>G", GTK_MENU_FUNC(goto_frame_cb), 0, NULL},
   {"/Edit/<separator>", NULL, NULL, 0, "<Separator>"},
-  {"/Edit/_Preferences...", NULL, GTK_MENU_FUNC(prefs_cb), E_PR_PG_NONE, NULL},
+  {"/Edit/_Preferences...", NULL, GTK_MENU_FUNC(prefs_cb), 0, NULL},
   {"/Edit/_Filters...", NULL, GTK_MENU_FUNC(filter_dialog_cb), 0, NULL},
 #ifdef HAVE_LIBPCAP
   {"/_Capture", NULL, NULL, 0, "<Branch>" },
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 72cda3c3b0..76d09247e8 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.12 2000/07/05 02:45:41 guy Exp $
+ * $Id: prefs_dlg.c,v 1.13 2000/07/05 06:33:02 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -79,13 +79,11 @@ static void     prefs_main_destroy_cb(GtkWidget *, gpointer);
 static GtkWidget *prefs_w;
 
 void
-prefs_cb(GtkWidget *w, gpointer sp) {
+prefs_cb(GtkWidget *w, gpointer dummy) {
   GtkWidget *main_vb, *top_hb, *bbox, *prefs_nb,
             *ok_bt, *save_bt, *cancel_bt;
   GtkWidget *print_pg, *column_pg, *stream_pg, *gui_pg, *label;
 
-  gint       start_page = (gint) sp;
-
   if (prefs_w != NULL) {
     /* There's already a "Preferences" dialog box; reactivate it. */
     reactivate_window(prefs_w);
@@ -138,10 +136,6 @@ prefs_cb(GtkWidget *w, gpointer sp) {
   label = gtk_label_new ("GUI");
   gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), gui_pg, label);
 
-  /* Jump to the specified page, if it was supplied */
-  if (start_page > E_PR_PG_NONE)
-    gtk_notebook_set_page(GTK_NOTEBOOK(prefs_nb), start_page);
-    
   /* Button row: OK and cancel buttons */
   bbox = gtk_hbutton_box_new();
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
diff --git a/gtk/prefs_dlg.h b/gtk/prefs_dlg.h
index f87ad443f4..75b87184cf 100644
--- a/gtk/prefs_dlg.h
+++ b/gtk/prefs_dlg.h
@@ -1,7 +1,7 @@
 /* prefs_dlg.h
  * Definitions for preference handling routines
  *
- * $Id: prefs_dlg.h,v 1.2 2000/02/12 06:46:54 guy Exp $
+ * $Id: prefs_dlg.h,v 1.3 2000/07/05 06:33:02 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -30,12 +30,6 @@
 #include "prefs.h"
 #endif
 
-
-#define E_PR_PG_NONE     -1
-#define E_PR_PG_PRINTING  0
-#define E_PR_PG_FILTER    1
-#define E_PR_PG_COLUMN    2
-
 void     prefs_cb(GtkWidget *, gpointer);
 
 #endif