summaryrefslogtreecommitdiff
path: root/epan/prefs.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-01-18 16:02:48 -0800
committerGerald Combs <gerald@wireshark.org>2016-01-27 16:13:19 +0000
commite57bb1919c80a2d1c245d539f6450b9b9defcb68 (patch)
tree0b4ab4fb919af94d7c92e313b2331894457b955f /epan/prefs.h
parent841f636dc075a306cd048e7f954b8cba5fa6960c (diff)
downloadwireshark-e57bb1919c80a2d1c245d539f6450b9b9defcb68.tar.gz
Make Qt UI capture filter behavior more closely match the GTK+ UI.
If the user enters a capture filter in the Capture Interfaces dialog and presses "Start", make sure we copy the filter to the main welcome screen. Back out capture filter code from g0ce9ac4. Leave out the code that set the global capture filter. Move the code that set individual capture filters to the welcome screen. Fix multiple interface selection in the welcome screen. Rename allFilterComboBox in the capture interfaces dialog to captureFilterComboBox to match the main welcome screen. If the user starts typing in captureFilterComboBox, make sure the "Capture Filter" column is visible. Update the "Capture Filter" column as the user types. Conversely, if the user edits the "Capture Filter" column, update captureFilterComboBox accordingly. If we're editing a per-interface filter make sure we commit its contents before starting capture. Map our device index directly to each tree item instead of using a separate map which will no longer be valid any time our sort order changes (which we do right away in our constructor). Don't set prefs.capture_devices_filter in the Qt UI. The GTK+ UI doesn't and doing so can lead to surprising behavior. Note that it's mostly unused. Note that we don't multiple selected filters very well. Ping-Bug: 11886 Change-Id: I3c052f4f464411e2fb8fb7d96b218e1ce2bac3fd Reviewed-on: https://code.wireshark.org/review/13410 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/prefs.h')
-rw-r--r--epan/prefs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/prefs.h b/epan/prefs.h
index ca5c389779..6bb48d70dd 100644
--- a/epan/prefs.h
+++ b/epan/prefs.h
@@ -202,7 +202,7 @@ typedef struct _e_prefs {
#endif
gchar *capture_devices_snaplen;
gchar *capture_devices_pmode;
- gchar *capture_devices_filter;
+ gchar *capture_devices_filter; /* XXX - Mostly unused. Deprecate? */
gboolean capture_prom_mode;
gboolean capture_pcap_ng;
gboolean capture_real_time;