Wireshark-commits: [Wireshark-commits] master-2.0 b354ac7: Qt: Handle unhandled filter actions.
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 27 Jun 2016 07:02:23 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b354ac734e5fb2f3c676fc6c0d1da05a37f11162
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

b354ac7 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Qt: Handle unhandled filter actions.
    
    Handle FilterAction::ActionColorize and ::ActionFind. Remove
    ::ActionConversation since it was unused. Assert when we encounter a
    missing FilterAction, similar to what we do in other parts of the code.
    
    Bug: 12363
    Change-Id: I5c1ecd488e5bdb9700a80fc70ec7c047311054b6
    Reviewed-on: https://code.wireshark.org/review/16131
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 60cdee9e307c15928a542adc547f27fd752c4837)
    Reviewed-on: https://code.wireshark.org/review/16147
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  9971717   radiotap: Fix for the VHT 20MHz MCS 9 data rate not displayed
    adds  b354ac7   Qt: Handle unhandled filter actions.


Summary of changes:
 ui/qt/filter_action.cpp             |    5 -----
 ui/qt/filter_action.h               |    9 ++++-----
 ui/qt/main_window.cpp               |    8 ++++----
 ui/qt/main_window.h                 |    3 ++-
 ui/qt/main_window_slots.cpp         |   22 ++++++++++++++++------
 ui/qt/protocol_hierarchy_dialog.cpp |    1 +
 ui/qt/search_frame.cpp              |    2 ++
 7 files changed, 29 insertions(+), 21 deletions(-)