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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=58dcefc11bf8eaea88dce7e48926c0719f69914e
Submitter: Stig Bj?rlykke (stig@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

58dcefc by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    Qt: save custom colors in recent_common file
    
    This allows to save colors across sessions for systems other than
    OSX that do not provide a system wide color picker
    
    While we are at it, let's stop reading the recent file twice at startup
    
    Bug: 11888
    Change-Id: I69ff14d699d8111fe6a8bdac0157fcd115a60c2b
    Reviewed-on: https://code.wireshark.org/review/12659
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    (cherry picked from commit bfe73e3ad7162830c222a5b0d73433a72324baa5)
    Conflicts:
    	ui/recent.c
    Reviewed-on: https://code.wireshark.org/review/12672
    

Actions performed:

    from  5ba8302   debian: Sync patches with Debian
    adds  58dcefc   Qt: save custom colors in recent_common file


Summary of changes:
 ui/qt/wireshark_application.cpp |   34 ++++++++++++++++++++++++++++++++++
 ui/qt/wireshark_application.h   |    2 ++
 ui/recent.c                     |   10 ++++++++++
 ui/recent.h                     |    1 +
 wireshark-qt.cpp                |   16 +---------------
 5 files changed, 48 insertions(+), 15 deletions(-)