From bcae998048190ce70ae9d0cbc05dc61e9e66c3b4 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 22 Jun 2016 14:41:16 -0700 Subject: Qt: Support the -j, -J, and -l command line flags Add support for -j, -J, and -l. Mark the -m flag deprecated. Bug: 12546 Change-Id: Ic44b3997840018e5d571aa1813a1646bce11d4a6 Reviewed-on: https://code.wireshark.org/review/16083 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- ui/qt/main_window.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/qt/main_window.cpp') diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 617e184835..4d81268241 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -1027,9 +1027,9 @@ void MainWindow::mergeCaptureFile() gchar *err_msg; if (!dfilter_compile(read_filter.toUtf8().constData(), &rfcode, &err_msg)) { - /* Not valid. Tell the user, and go back and run the file + /* Not valid. Tell the user, and go back and run the file selection box again once they dismiss the alert. */ - //bad_dfilter_alert_box(top_level, read_filter->str); + // Similar to commandline_info.jfilter section in main(). QMessageBox::warning(this, tr("Invalid Read Filter"), QString(tr("The filter expression %1 isn't a valid read filter. (%2).").arg(read_filter, err_msg)), QMessageBox::Ok); -- cgit v1.2.1