Wireshark-commits: [Wireshark-commits] master 01fb470: More retapping fixups.
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: Thu, 27 Aug 2015 21:27:40 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=01fb470acd71528bede068727b7614ae6f534c4f
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

01fb470 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    More retapping fixups.
    
    Disable the main file close and reload actions while we're retapping,
    otherwise many of our dialogs will crash.
    
    Disable the TapParameterDialog filter entry while we're retapping. This
    keeps us from enabling the "Apply" button when we shouldn't.
    
    Don't prematurely disconnect our signals in WiresharkDialog.
    
    Change-Id: Iaf507eb4503b9c296766f109f2b8c71343263982
    Reviewed-on: https://code.wireshark.org/review/10274
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  30c2f23   Eliminate proto_tree_add_text from some dissectors.
    adds  01fb470   More retapping fixups.


Summary of changes:
 ui/qt/capture_file.h           |    2 +-
 ui/qt/main_window.cpp          |    4 ++++
 ui/qt/main_window.h            |    2 ++
 ui/qt/main_window_slots.cpp    |   13 +++++++++++++
 ui/qt/tap_parameter_dialog.cpp |   25 +++++++++++++++----------
 ui/qt/tap_parameter_dialog.h   |    1 -
 ui/qt/wireshark_dialog.cpp     |   17 +++++++++++------
 ui/qt/wireshark_dialog.h       |   15 ++++++++++-----
 8 files changed, 56 insertions(+), 23 deletions(-)