[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e08bc0dd6238b593b276609ce4ab78f512bf7c09
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

e08bc0d by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Don't warn about overwriting filename preferences.
    
    When specifying a filename preference (e.g. the SSL pre-master secret
    log filename) don't warn about overwriting the file. Most of the time
    we're reading the file and when we're not (e.g. for the SSL debug log)
    overwriting it is kind of the point.
    
    Preference descriptions are plain text. We display them in tooltips as
    rich text. Convert them accordingly.
    
    Fixup some of the SSL preference descriptions.
    
    Bug: 11010
    Change-Id: I4f1b1f3dd270c01648d9dd52ae20381c3c0d2e37
    Reviewed-on: https://code.wireshark.org/review/8665
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  6d5fa70   is_linux_bonding_device() is only used if we HAVE_PCAP_CREATE so only define it if we HAVE_PCAP_CREATE.
    adds  e08bc0d   Don't warn about overwriting filename preferences.


Summary of changes:
 epan/dissectors/packet-ssl-utils.c       |    4 ++--
 epan/dissectors/packet-ssl.c             |    4 ++--
 ui/qt/module_preferences_scroll_area.cpp |   20 ++++++++++++++++----
 3 files changed, 20 insertions(+), 8 deletions(-)