Make the routines internal to the filter-editing dialog box static.

Declare the one routine exported by "gtk/filter_prefs.c" in
"gtk/filter_prefs.h" rather than in "gtk/main.h".  Declare
"E_FILT_TE_PTR_KEY" there, as well, rather than in "prefs_dlg.h", as the
filter-editing dialog box is no longer a preference tab.

Don't include "prefs_dlg.h" unless the stuff declared therein is of
interest.

Fix "gtk/find_dlg.c" to fire up the filter-editing dialog box, not the
no-longer-extant preferences tab for filters, if the "Filter:" button is
clicked.

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

diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 586946d991f512b2c760c3c2f57ff2484a61d58e..abb649071a054421ef6e87fce1907e3b684312f1 100644 (file)
--- 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.18 2000/01/18 09:24:57 guy Exp $
+ * $Id: capture_dlg.c,v 1.19 2000/02/12 06:46:51 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -54,7 +54,7 @@
 #include "globals.h"
 #include "main.h"
 #include "capture_dlg.h"
-#include "prefs_dlg.h"
+#include "filter_prefs.h"
 #include "simple_dialog.h"
 #include "util.h"
 

diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index 062386e4d18683785ace5030b18bd39234780a3c..183c3a76d6fe3da780be4bfc3b156e4fd70dac7b 100644 (file)
--- 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.18 2000/01/25 05:48:46 guy Exp $
+ * $Id: file_dlg.c,v 1.19 2000/02/12 06:46:52 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -48,9 +48,7 @@
 #include "keys.h"
 #endif
 
-#ifndef __PREFS_DLG_H__
-#include "prefs_dlg.h"
-#endif
+#include "filter_prefs.h"
 
 #ifndef __DIALOG_H__
 #include "simple_dialog.h"

diff --git a/gtk/filter_prefs.c b/gtk/filter_prefs.c
index 0d550489b712b7f66298b8b5ce0cc7dab95ccf63..aa59e2ec7bb7c0122ba2cc52206911eaa5eebb1c 100644 (file)
--- a/gtk/filter_prefs.c
+++ b/gtk/filter_prefs.c
@@ -3,7 +3,7 @@
  * (This used to be a notebook page under "Preferences", hence the
  * "prefs" in the file name.)
  *
- * $Id: filter_prefs.c,v 1.8 2000/01/29 16:41:27 gram Exp $
+ * $Id: filter_prefs.c,v 1.9 2000/02/12 06:46:52 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -74,8 +74,20 @@ static void filter_dlg_save(GtkWidget *save_bt, gpointer parent_w);
 static void filter_dlg_cancel(GtkWidget *cancel_bt, gpointer parent_w);
 static void filter_sel_apply_cb(GtkWidget *cancel_bt, gpointer parent_w);
 
-void
-get_filter_list() {
+static GtkWidget *filter_prefs_show(GtkWidget *);
+static void       filter_sel_list_cb(GtkWidget *, gpointer);
+static void       filter_sel_new_cb(GtkWidget *, gpointer);
+static void       filter_sel_chg_cb(GtkWidget *, gpointer);
+static void       filter_sel_copy_cb(GtkWidget *, gpointer);
+static void       filter_sel_del_cb(GtkWidget *, gpointer);
+static void       filter_prefs_ok(GtkWidget *);
+static void       filter_prefs_save(GtkWidget *);
+static void       filter_prefs_cancel(GtkWidget *);
+static void       filter_prefs_delete(GtkWidget *);
+
+static void
+get_filter_list(void)
+{
   filter_def *filt;
   FILE       *ff;
   gchar      *ff_path, *ff_name = PF_DIR "/filters", f_buf[256];
@@ -127,6 +139,7 @@ get_filter_list() {
   fclose(ff);
   g_free(ff_path);
 }
+
 /* the window that pops up for filter editing/applying */
 void
 filter_dialog_cb(GtkWidget *w)
@@ -212,7 +225,7 @@ filter_dlg_cancel(GtkWidget *cancel_bt, gpointer parent_w)
 }
        
 /* Create and display the filter selection widgets. */
-GtkWidget *
+static GtkWidget *
 filter_prefs_show(GtkWidget *w) {
   GtkWidget  *main_vb, *top_hb, *list_bb, *new_bt, *filter_sc,
              *nl_item, *nl_lb, *middle_hb, *name_lb, *bottom_hb,
@@ -349,7 +362,7 @@ filter_prefs_show(GtkWidget *w) {
   return(main_vb);
 }
 
-void
+static void
 filter_sel_list_cb(GtkWidget *l, gpointer data) {
   filter_def *filt;
   gchar      *name = "", *strval = "";
@@ -387,7 +400,7 @@ filter_sel_list_cb(GtkWidget *l, gpointer data) {
 
 /* To do: add input checking to each of these callbacks */
  
-void
+static void
 filter_sel_new_cb(GtkWidget *w, gpointer data) {
   filter_def *filt;
   gchar      *name, *strval;
@@ -414,7 +427,7 @@ filter_sel_new_cb(GtkWidget *w, gpointer data) {
   }
 }
 
-void
+static void
 filter_sel_chg_cb(GtkWidget *w, gpointer data) {
   filter_def *filt;
   gchar      *name = "", *strval = "";
@@ -444,7 +457,7 @@ filter_sel_chg_cb(GtkWidget *w, gpointer data) {
   }
 }
 
-void
+static void
 filter_sel_copy_cb(GtkWidget *w, gpointer data) {
   GList      *sl, *flp;
   filter_def *filt, *nfilt;
@@ -477,7 +490,7 @@ filter_sel_copy_cb(GtkWidget *w, gpointer data) {
   }
 }
 
-void
+static void
 filter_sel_del_cb(GtkWidget *w, gpointer data) {
   GList      *sl, *flp;
   filter_def *filt;
@@ -521,7 +534,7 @@ filter_sel_apply_cb(GtkWidget *w, gpointer data)
        }
 }
 
-void
+static void
 filter_prefs_ok(GtkWidget *w) {
   GList      *flp, *sl;
   GtkObject  *l_item;
@@ -541,7 +554,7 @@ filter_prefs_ok(GtkWidget *w) {
   filter_prefs_delete(w);
 }
 
-void
+static void
 filter_prefs_save(GtkWidget *w) {
   GList       *flp;
   filter_def  *filt;
@@ -575,13 +588,13 @@ filter_prefs_save(GtkWidget *w) {
   g_free(ff_path);
 }
 
-void
+static void
 filter_prefs_cancel(GtkWidget *w) {
 
   filter_prefs_delete(w);
 }
 
-void
+static void
 filter_prefs_delete(GtkWidget *w) {
  
   /* Let the list cb know we're about to destroy the widget tree, so it */

diff --git a/gtk/filter_prefs.h b/gtk/filter_prefs.h
index b55778ba6a32c9338f746e4860b1ea734b55775f..8902b746337436bf24f723bffdf78cbd759cf468 100644 (file)
--- a/gtk/filter_prefs.h
+++ b/gtk/filter_prefs.h
@@ -1,7 +1,9 @@
 /* filter_prefs.h
- * Definitions for packet filter preferences window
+ * Definitions for dialog boxes for filter editing
+ * (This used to be a notebook page under "Preferences", hence the
+ * "prefs" in the file name.)
  *
- * $Id: filter_prefs.h,v 1.3 1999/09/10 06:53:31 guy Exp $
+ * $Id: filter_prefs.h,v 1.4 2000/02/12 06:46:53 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -26,15 +28,8 @@
 #ifndef __FILTER_H__
 #define __FILTER_H__
 
-GtkWidget *filter_prefs_show(GtkWidget *);
-void       filter_sel_list_cb(GtkWidget *, gpointer);
-void       filter_sel_new_cb(GtkWidget *, gpointer);
-void       filter_sel_chg_cb(GtkWidget *, gpointer);
-void       filter_sel_copy_cb(GtkWidget *, gpointer);
-void       filter_sel_del_cb(GtkWidget *, gpointer);
-void       filter_prefs_ok(GtkWidget *);
-void       filter_prefs_save(GtkWidget *);
-void       filter_prefs_cancel(GtkWidget *);
-void       filter_prefs_delete(GtkWidget *);
+void filter_dialog_cb(GtkWidget *);
+
+#define E_FILT_TE_PTR_KEY "filter_te_ptr"
 
 #endif /* filter.h */

diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index 12dab2d49a384ba6034e81a08afe358e81de69d9..78b398cc61e6c8d86d57155b4eaa7e5176be3efc 100644 (file)
--- 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.5 2000/01/03 06:59:21 guy Exp $
+ * $Id: find_dlg.c,v 1.6 2000/02/12 06:46:53 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -43,7 +43,7 @@
 #include "globals.h"
 
 #include "find_dlg.h"
-#include "prefs_dlg.h"
+#include "filter_prefs.h"
 #include "simple_dialog.h"
 
 /* Capture callback data keys */
@@ -79,7 +79,7 @@ find_frame_cb(GtkWidget *w, gpointer d)
   
   filter_bt = gtk_button_new_with_label("Filter:");
   gtk_signal_connect(GTK_OBJECT(filter_bt), "clicked",
-    GTK_SIGNAL_FUNC(prefs_cb), (gpointer) E_PR_PG_FILTER);
+    GTK_SIGNAL_FUNC(filter_dialog_cb), NULL);
   gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, TRUE, 0);
   gtk_widget_show(filter_bt);
   

diff --git a/gtk/main.c b/gtk/main.c
index cea03affc8116f6d99541d586931bf32b713505c..3d05e3bf4bb27143291d2d47fb18a5c86249b7d9 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.103 2000/02/09 19:18:04 gram Exp $
+ * $Id: main.c,v 1.104 2000/02/12 06:46:53 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -98,6 +98,7 @@
 #include "file.h"
 #include "menu.h"
 #include "../menu.h"
+#include "filter_prefs.h"
 #include "prefs_dlg.h"
 #include "column.h"
 #include "print.h"

diff --git a/gtk/main.h b/gtk/main.h
index c34e06e71c68893e4f1b82402ed2f33ecc4cefdb..e1bca39cda6ca0626e20e9d792dd9a4999c0e2df 100644 (file)
--- a/gtk/main.h
+++ b/gtk/main.h
@@ -1,7 +1,7 @@
 /* ethereal.h
  * Global defines, etc.
  *
- * $Id: main.h,v 1.11 2000/01/24 20:29:07 gram Exp $
+ * $Id: main.h,v 1.12 2000/02/12 06:46:54 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -72,6 +72,5 @@ void file_print_packet_cmd_cb(GtkWidget *, gpointer);
 void tools_plugins_cmd_cb(GtkWidget *, gpointer);
 void expand_all_cb(GtkWidget *, gpointer);
 void collapse_all_cb(GtkWidget *, gpointer);
-void filter_dialog_cb(GtkWidget *);
 
 #endif /* __MAIN_H__ */

diff --git a/gtk/menu.c b/gtk/menu.c
index e4c94e6d79827f8d6ea83a46dc8aeb327bc22159..21d096507cf3bd2b8a2fe9befe1a2d93e0dde701 100644 (file)
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * Menu routines
  *
- * $Id: menu.c,v 1.21 2000/01/25 03:48:16 gerald Exp $
+ * $Id: menu.c,v 1.22 2000/02/12 06:46:54 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -43,6 +43,7 @@
 #include "menu.h"
 #include "packet.h"
 #include "capture_dlg.h"
+#include "filter_prefs.h"
 #include "find_dlg.h"
 #include "goto_dlg.h"
 #include "summary_dlg.h"

diff --git a/gtk/prefs_dlg.h b/gtk/prefs_dlg.h
index 68c9132f6236a54b1cddb2d615f1cefdc70bf9e9..f87ad443f49e77f2c7c268161f8a3f9f5a8ee265 100644 (file)
--- 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.1 1999/09/09 03:32:03 gram Exp $
+ * $Id: prefs_dlg.h,v 1.2 2000/02/12 06:46:54 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -36,8 +36,6 @@
 #define E_PR_PG_FILTER    1
 #define E_PR_PG_COLUMN    2
 
-#define E_FILT_TE_PTR_KEY "filter_te_ptr"
-
 void     prefs_cb(GtkWidget *, gpointer);
 
 #endif