diff options
| -rw-r--r-- | ui/alert_box.c | 20 | ||||
| -rw-r--r-- | ui/alert_box.h | 7 | ||||
| -rw-r--r-- | ui/gtk/capture_file_dlg.c | 4 | ||||
| -rw-r--r-- | ui/gtk/find_dlg.c | 2 | ||||
| -rw-r--r-- | ui/gtk/gui_utils.c | 2 | ||||
| -rw-r--r-- | ui/gtk/gui_utils.h | 2 | ||||
| -rw-r--r-- | ui/gtk/io_stat.c | 5 | ||||
| -rw-r--r-- | ui/gtk/main.c | 4 |
8 files changed, 10 insertions, 36 deletions
diff --git a/ui/alert_box.c b/ui/alert_box.c index 148f35689c..eacddef189 100644 --- a/ui/alert_box.c +++ b/ui/alert_box.c @@ -112,23 +112,3 @@ write_failure_alert_box(const char *filename, int err) file_write_error_message(err), filename); } } - -/* - * Alert box for an invalid display filter expression. - * Assumes "dfilter_error_msg" has been set by "dfilter_compile()" to the - * error message for the filter. - * - * XXX - should this have a "Help" button that pops up the display filter - * help? - */ -void -bad_dfilter_alert_box(const char *dftext) -{ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - "%s%s%s\n" - "\n" - "The filter expression \"%s\" isn't a valid display filter.\n" - "See the help for a description of the display filter syntax.", - simple_dialog_primary_start(), dfilter_error_msg, - simple_dialog_primary_end(), dftext); -} diff --git a/ui/alert_box.h b/ui/alert_box.h index 53531e8455..6684fa1d87 100644 --- a/ui/alert_box.h +++ b/ui/alert_box.h @@ -56,13 +56,6 @@ extern void read_failure_alert_box(const char *filename, int err); */ extern void write_failure_alert_box(const char *filename, int err); -/* - * Alert box for an invalid display filter expression. - * Assumes "dfilter_error_msg" has been set by "dfilter_compile()" to the - * error message for the filter. - */ -extern void bad_dfilter_alert_box(const char *dftext); - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c index 719294a0cf..0ab1ae7dea 100644 --- a/ui/gtk/capture_file_dlg.c +++ b/ui/gtk/capture_file_dlg.c @@ -562,7 +562,7 @@ file_open_cmd(GtkWidget *w) if (!dfilter_compile(rfilter, &rfcode)) { /* Not valid. Tell the user, and go back and run the file selection box again once they dismiss the alert. */ - bad_dfilter_alert_box_modal(file_open_w, rfilter); + bad_dfilter_alert_box(file_open_w, rfilter); g_free(cf_name); continue; } @@ -815,7 +815,7 @@ file_merge_cmd(GtkWidget *w) if (!dfilter_compile(rfilter, &rfcode)) { /* Not valid. Tell the user, and go back and run the file selection box again once they dismiss the alert. */ - bad_dfilter_alert_box_modal(file_merge_w, rfilter); + bad_dfilter_alert_box(file_merge_w, rfilter); g_free(cf_name); continue; } diff --git a/ui/gtk/find_dlg.c b/ui/gtk/find_dlg.c index b40bb41ea6..d7380e917e 100644 --- a/ui/gtk/find_dlg.c +++ b/ui/gtk/find_dlg.c @@ -629,7 +629,7 @@ find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) */ if (!dfilter_compile(filter_text, &sfcode)) { /* The attempt failed; report an error. */ - bad_dfilter_alert_box_modal(GTK_WIDGET(parent_w), filter_text); + bad_dfilter_alert_box(GTK_WIDGET(parent_w), filter_text); return; } diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c index 72c22a0733..344203ea08 100644 --- a/ui/gtk/gui_utils.c +++ b/ui/gtk/gui_utils.c @@ -587,7 +587,7 @@ GtkWidget *pixbuf_to_widget(const char * pb_data) { * help? */ void -bad_dfilter_alert_box_modal(GtkWidget *parent, const char *dftext) +bad_dfilter_alert_box(GtkWidget *parent, const char *dftext) { GtkWidget *msg_dialog; diff --git a/ui/gtk/gui_utils.h b/ui/gtk/gui_utils.h index 5669a0fc65..064490d4c1 100644 --- a/ui/gtk/gui_utils.h +++ b/ui/gtk/gui_utils.h @@ -195,7 +195,7 @@ extern void reactivate_window(GtkWidget *win); * @param parent parent window from which the display filter came * @param dftext text of the display filter */ -extern void bad_dfilter_alert_box_modal(GtkWidget *parent, const char *dftext); +extern void bad_dfilter_alert_box(GtkWidget *parent, const char *dftext); /** Create a GtkScrolledWindow, set its scrollbar placement appropriately, * and remember it. diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c index c243248300..91b45820a0 100644 --- a/ui/gtk/io_stat.c +++ b/ui/gtk/io_stat.c @@ -1989,7 +1989,7 @@ create_ctrl_area(io_stat_t *io, GtkWidget *box) } static void -filter_callback(GtkWidget *widget _U_, gpointer user_data) +filter_callback(GtkWidget *widget, gpointer user_data) { io_stat_graph_t *gio = user_data; const char *filter; @@ -2100,7 +2100,8 @@ filter_callback(GtkWidget *widget _U_, gpointer user_data) /* first check if the filter string is valid. */ filter=gtk_entry_get_text(GTK_ENTRY(gio->filter_field)); if(!dfilter_compile(filter, &dfilter)) { - bad_dfilter_alert_box(filter); + bad_dfilter_alert_box(gtk_widget_get_toplevel(widget), + filter); disable_graph(gio); io_stat_redraw(gio->io); return; diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 4b271d5f80..e40b91eb39 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -2956,7 +2956,7 @@ main(int argc, char *argv[]) check_and_warn_user_startup(cf_name); if (rfilter != NULL) { if (!dfilter_compile(rfilter, &rfcode)) { - bad_dfilter_alert_box_modal(top_level, rfilter); + bad_dfilter_alert_box(top_level, rfilter); rfilter_parse_failed = TRUE; } } @@ -2992,7 +2992,7 @@ main(int argc, char *argv[]) } else if (jfilter != NULL) { /* try to compile given filter */ if (!dfilter_compile(jfilter, &jump_to_filter)) { - bad_dfilter_alert_box_modal(top_level, jfilter); + bad_dfilter_alert_box(top_level, jfilter); } else { /* Filter ok, jump to the first packet matching the filter conditions. Default search direction is forward, but if |