diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-11 15:00:27 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-12 23:32:54 +0000 |
| commit | 931807ea61cd9b2729fa06fefa6ce3a09b89ee4b (patch) | |
| tree | b796fb4fb520959d3fc1e6fb00c1da223c22fdbf /epan/frame_data.h | |
| parent | b3e2c568b00408f37282c73bed74e421bd574766 (diff) | |
Qt: Add the "new packet" window^Wdialog^Wwindow.
Allow persistence across files. Preserve the use of "window" even
though we're really a dialog.
Update ByteViewTab and ProtoTree to support multiple instances.
Remove the need for a cast in frame_data.
Add more forward declarations.
Change-Id: I50d3d9d1455b8ecc158a37218f9e41fe696d5ae2
Reviewed-on: https://code.wireshark.org/review/7086
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/frame_data.h')
| -rw-r--r-- | epan/frame_data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/frame_data.h b/epan/frame_data.h index bf8842e640..a993ed1ad9 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -72,7 +72,7 @@ typedef struct _frame_data { struct { unsigned int passed_dfilter : 1; /**< 1 = display, 0 = no display */ unsigned int dependent_of_displayed : 1; /**< 1 if a displayed frame depends on this frame */ - unsigned int encoding : 1; /**< Character encoding (ASCII, EBCDIC...) */ + packet_char_enc encoding : 1; /**< Character encoding (ASCII, EBCDIC...) */ unsigned int visited : 1; /**< Has this packet been visited yet? 1=Yes,0=No*/ unsigned int marked : 1; /**< 1 = marked by user, 0 = normal */ unsigned int ref_time : 1; /**< 1 = marked as a reference time frame, 0 = normal */ |