Add a new routine "filter_button_destroy_cb()", and make it the

"destroy" signal handler for any button that pops up a filter; if the
button has a filter dialog box associated with it, it destroys that
dialog box.

Have the routines that create filter dialog boxes asociate the dialog
box with the button that created it, so that if the button is destroyed
the filter dialog box can be destroyed as well, and associate the button
with the dialog box.

This means that if a dialog box has a button to create a filter, we no
longer have to have the destroy handler for the dialog box destroy any
filters - that'll happen when the button in the dialog box is destroyed
as part of the process of destroying the dialog box.

Don't make the "Filter" buttons in the io_stat dialog box insensitive if
there's already a filter dialog box open - we can have more than one
open per dialog box.

svn path=/trunk/; revision=6930

1 files changed, 2 insertions, 3 deletions

diff --git a/gtk/filter_prefs.h b/gtk/filter_prefs.h
index b14b0c2618..ef92174947 100644
--- a/gtk/filter_prefs.h
+++ b/gtk/filter_prefs.h
@@ -3,7 +3,7 @@
  * (This used to be a notebook page under "Preferences", hence the
  * "prefs" in the file name.)
  *
- * $Id: filter_prefs.h,v 1.13 2003/01/11 11:10:33 sahlberg Exp $
+ * $Id: filter_prefs.h,v 1.14 2003/01/15 05:20:19 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -41,11 +41,10 @@ typedef struct {
 
 void capture_filter_construct_cb(GtkWidget *w, gpointer user_data);
 GtkWidget *display_filter_construct_cb(GtkWidget *w, gpointer construct_args_ptr);
+void filter_button_destroy_cb(GtkWidget *button, gpointer user_data);
 void cfilter_dialog_cb(GtkWidget *w);
 void dfilter_dialog_cb(GtkWidget *w);
 
 #define E_FILT_TE_PTR_KEY	"filter_te_ptr"
-#define E_FILT_CALLER_PTR_KEY	"filter_caller_ptr"
-#define E_FILT_DIALOG_PTR_KEY	"filter_dialog_ptr"
 
 #endif /* filter.h */