aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/toolbar.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2003-10-29 22:39:49 +0000
committerGuy Harris <guy@alum.mit.edu>2003-10-29 22:39:49 +0000
commit5f01c7a082ddf7a6dea0354be7eca67cc7f442a1 (patch)
treea3fdd1fd8a6562ff496257c970599755c7c11ec9 /gtk/toolbar.c
parentb9b73fe54c0eaa2af73161043321234604169325 (diff)
Have the "edit display filters" button do the exact same thing as the
"Edit -> Display Filters..." menu item, as per Ulf Lamping - there's apparently some problem wherein &args doesn't get passed properly to the callback. svn path=/trunk/; revision=8819
Diffstat (limited to 'gtk/toolbar.c')
-rw-r--r--gtk/toolbar.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index cf2047b4c3..643cb82008 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -2,7 +2,7 @@
* The main toolbar
* Copyright 2003, Ulf Lamping <ulf.lamping@web.de>
*
- * $Id: toolbar.c,v 1.11 2003/10/22 22:13:13 guy Exp $
+ * $Id: toolbar.c,v 1.12 2003/10/29 22:39:49 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -251,16 +251,6 @@ static void get_main_toolbar(GtkWidget *window, GtkWidget **toolbar)
GtkWidget *iconw;
GdkBitmap * mask;
- /* Display filter construct dialog has only a "Save" and a "Close" button.
- * XXX - Adding the "Ok" and "Apply" buttons would need some more work here
- */
- static construct_args_t args = {
- "Ethereal: Edit Display Filter",
- FALSE,
- FALSE
- };
-
-
/* this function should be only called once! */
g_assert(!toolbar_init);
@@ -514,8 +504,7 @@ static void get_main_toolbar(GtkWidget *window, GtkWidget **toolbar)
display_filter_button =
gtk_toolbar_append_item(GTK_TOOLBAR(*toolbar), "DFilter",
"Edit Display Filters...", "Private", iconw,
- GTK_SIGNAL_FUNC(display_filter_construct_cb),
- &args);
+ GTK_SIGNAL_FUNC(dfilter_dialog_cb), NULL);
/* color filter button */
#if GTK_MAJOR_VERSION < 2