Wireshark · Wireshark-commits: [Wireshark-commits] rev 49760: /trunk-1.10/ui/qt/ /trunk-1.10/ui/qt/: main_window.cpp main_window.h

[etxrab@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=49760

User: etxrab
Date: 2013/06/04 12:38 AM

Log:
 Copy over (part of):
 Revision 49286 - Merge capture_start_confirmed() into capture_start_cb().
 
 Revision 49293 - Pull dnd_merge_files() into dnd_open_file_cmd(); the resulting code is a
 bit simpler.
 
 Don't bother popping up a window saying "you dragged more than one file,
 so we're merging"; presumably that's what they had in mind when they
 dragged multiple files.  (If that's not what they had in mind, the
 window should at least offer a choice to cancel.)
 
 Revision 49493 - Pull the capture-session state information out of capture_opts and put
 it into a separate capture_session structure.  capture_opts should
 contain only user-specified option information (and stuff directly
 derived from it, such as the "capturing from a pipe" flag).
 
 
 Revision 49497 - Fix the Windows side to look for the signal pipe stuff in cap_session.
 
 Revision 49535 - Make a routine not used outside this file static.
 
 Revision 49517 - AAAAAArgh.  The capture_input_new_XXX routines are called from
 capture_sync.c, not from capture.c, so they should be declared in
 capture_sync.h, so callers that use the capture_sync.c stuff but not the
 capture.c stuff - such as TShark - get the declarations and get their
 implementations compared with the signatures that they should have.
 
 Doing so points out that some of them in TShark *don't*, so fix that.

Directory: /trunk-1.10/ui/qt/
  Changes    Path                         Action
  +15 -14    main_window.cpp              Modified
  +8 -7      main_window.h                Modified
  +19 -18    main_window_slots.cpp        Modified
  +9 -9      wireshark_application.cpp    Modified
  +10 -9     wireshark_application.h      Modified