Wireshark-commits: [Wireshark-commits] master-1.12 6380d81: Don't just blindly tell application X11
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6380d81023e41ed29c6d7047ff5cddc6e7d695d5
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark
Commits:
6380d81 by Guy Harris (guy@xxxxxxxxxxxx):
Don't just blindly tell application X11 to do anything.
Determine what type of X11 (bundled from Apple, unbundled XQuartz) we
should have and what type we do have.
If we don't have any installed, don't tell X11 to do anything, as that
just pops up a "where is X11?" dialog; that's information the user
shouldn't need to tell the system if it is installed, and it's
information for which the user shouldn't be asked if it's not installed
- and if they're asked, they might answer incorrectly, leaving a system
that doesn't properly launch X11 for Wireshark. (See various
ask.wireshark.org questions about this, for example.)
Pick up some changes from newer versions of Inkscape, such as using
unsigned char *, not using FSSpecs, and adding some comments, while
we're at it.
Change-Id: Ic9a2b25938c4eec5628d1c16c7db28aa0714203e
Reviewed-on: https://code.wireshark.org/review/8559
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from 72b0051 MBIM: fix GSM SMS transmitted PDU length
adds 6380d81 Don't just blindly tell application X11 to do anything.
Summary of changes:
packaging/macosx/ScriptExec/main.c | 183 +++++++++++++++++++++++++++---------
1 file changed, 140 insertions(+), 43 deletions(-)
