Wireshark-commits: [Wireshark-commits] master-2.2 98004d7: Qt: Handle cancel in import coloring rul

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 21 Feb 2017 14:22:43 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=98004d7085a8a08786ee672780187b74a789b880
Submitter: Stig Bjørlykke (stig@xxxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

98004d7 by Stig Bjørlykke (stig@xxxxxxxxxxxxx):

    Qt: Handle cancel in import coloring rules
    
    Change-Id: I450cfc41d19c0dcb4aa59c0515d8d0834cfee60b
    Reviewed-on: https://code.wireshark.org/review/20223
    Petri-Dish: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    (cherry picked from commit 6814cf4fa7c42a95417a52ddef4abedd554b300e)
    Reviewed-on: https://code.wireshark.org/review/20227
    

Actions performed:

    from  e7176e9   opcua: display abort messages correctly
    adds  98004d7   Qt: Handle cancel in import coloring rules


Summary of changes:
 ui/qt/coloring_rules_dialog.cpp |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)