diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-09-18 21:16:57 +0200 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-09-19 00:21:14 +0000 |
commit | d54738570146f8479821e1f406a76da1ed68b215 (patch) | |
tree | 406d9e71eb76c669d76f362f88bbb2626da5fb04 /ui/qt/decode_as_dialog.cpp | |
parent | e2487f3f165fef3fe716f920aeab909f14d1d1a2 (diff) | |
download | wireshark-d54738570146f8479821e1f406a76da1ed68b215.tar.gz |
Qt: set default current protocol in 'Decode As' window to none instead of HTTP
It makes more sense (not trying to decode UDP/TCP ports as HTTP) and is consistent across dissectors tables (while currently we have an empty field for tables other than UDP/TCP)
Change-Id: I794529f0f46b4197437a1d258f808991ae2338ad
Reviewed-on: https://code.wireshark.org/review/10571
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/qt/decode_as_dialog.cpp')
-rw-r--r-- | ui/qt/decode_as_dialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/decode_as_dialog.cpp b/ui/qt/decode_as_dialog.cpp index 631679b12e..640063b167 100644 --- a/ui/qt/decode_as_dialog.cpp +++ b/ui/qt/decode_as_dialog.cpp @@ -51,7 +51,7 @@ const int default_col_ = 3; // aka "initial" const int proto_col_ = 4; // aka "current" const char *default_table_ = "TCP port"; -const char *default_proto_ = "HTTP"; +const char *default_proto_ = DECODE_AS_NONE; const char *default_int_selector_ = "0"; // Arbitrary const char *default_str_selector_ = "foo"; // Arbitrary @@ -596,7 +596,7 @@ void DecodeAsDialog::applyChanges() continue; } - if (item->text(proto_col_) == "(none)" || !dissector_info->dissector_handle) { + if (item->text(proto_col_) == DECODE_AS_NONE || !dissector_info->dissector_handle) { decode_as_entry->reset_value(decode_as_entry->table_name, selector_value); break; } else { |