Wireshark-commits: [Wireshark-commits] master 14881e7: tshark: load decode_as_entries file
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: Sun, 21 Feb 2016 18:25:12 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=14881e72d63d25048464155c5e8cc43a51731b16
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

14881e7 by Michael Mann (mmann78@xxxxxxxxxxxx):

    tshark: load decode_as_entries file
    
    With Wireshark 2.0, some dissector preferences were removed in favor of 'Decode As' functionality.
    But the settings saved in the GUI are not loaded in tshark, preventing their use without an explicit call to '-d' option.
    Let's load decode_as_entries file by default and have it overridden by the '-d' option if required.
    
    Ping-Bug: 12124
    Change-Id: I134a424cb6cf8fc89b7096a659ef1605314a70a2
    Reviewed-on: https://code.wireshark.org/review/13956
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  8889be1   autotools: Add GLib/GTK configuration definitions to package cflags
    adds  14881e7   tshark: load decode_as_entries file


Summary of changes:
 tshark.c                   |    4 ++++
 ui/decode_as_utils.c       |   19 +++++++++----------
 ui/decode_as_utils.h       |    2 +-
 ui/gtk/decode_as_dlg.c     |    8 +++++++-
 ui/qt/decode_as_dialog.cpp |   10 +++++++++-
 5 files changed, 30 insertions(+), 13 deletions(-)