aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk
AgeCommit message (Collapse)AuthorFilesLines
2016-06-28Have commandline_other_options() directly fill in the global structure.Guy Harris1-1/+1
Other code looks at the global structure, so there won't be other structures; just fill in the global structure directly. Change-Id: I4dc87b79168c5a7c9ab1f085aa2d78cc6d2c9019 Reviewed-on: https://code.wireshark.org/review/16184 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-28Make quit_after_cap an item in commandline_param_info_t.Guy Harris1-46/+45
And make the commandline_info structure global, so all the places that look at quit_after_cap can get at it. Change-Id: I006329cf8842c655cca36f024570855d1b16e107 Reviewed-on: https://code.wireshark.org/review/16182 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-28Pull quit_after_cap out of the global capture options.Guy Harris1-3/+3
Really, all the GUI-related options should be pulled out, so they're not cluttering up dumpcap and tshark. Change-Id: I0276dee2be48bae3498a819d8c0c2747fe1352e7 Reviewed-on: https://code.wireshark.org/review/16180 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-26Add an RA_INTERFACES register action.Gerald Combs2-2/+7
Add RA_INTERFACES between RA_PREFERENCES and RA_CONFIGURATION. Wireshark was spending a suspiciously long time loading module preferences here. (Now we just need to find out why that section of the code is slow.) Change-Id: Iecbe55e8e10c8844bcb151a13e383cb13a3f6eb1 Reviewed-on: https://code.wireshark.org/review/16133 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26filter: rename shadow varDario Lombardo2-5/+5
Change-Id: Idc18f2988754fc21b1f8f2dcadfe5e3dd31d5545 Reviewed-on: https://code.wireshark.org/review/16102 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-25Minor UI locale updates.Gerald Combs1-7/+4
Qt: Call setlocale before commandline_early_options so that we get proper "-v" output, similar to the GTK+ UI. GTK+: Call setlocale once at startup. Bug: 11960 Change-Id: I3c3a196b9d94fc768e1085200891bc8d67e21a08 Reviewed-on: https://code.wireshark.org/review/16132 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-23RTP player: increase the maximum number of silence frames to 30 minutes worth.Jeff Morriss1-1/+0
The BadAlloc X11 crash I reported in bug 4119 (which is why the limit was as low as it was) has long since been fixed thanks to bug 2630/I71e1bd2f9a62792db06ce887e2bbe7a96d110e0a so we can now deal with more silence frames. Change-Id: I0127381e71e497560e0f23af04f9d96af1ed6335 Ping-Bug: 5902 Ping-Bug: 4119 Ping-Bug: 2270 Reviewed-on: https://code.wireshark.org/review/16003 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-22Don't close Wireshark (GTK) if user cancels Save on Close.Michael Mann1-13/+18
Bug: 9635 Change-Id: I4a6e3ca676f1c1096521c0a8147a1459777c92fa Reviewed-on: https://code.wireshark.org/review/16075 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-22GTK: Keep display filter applied when switching profilesBalint Reczey1-2/+8
Bug: 6130 Change-Id: I3bcd6aaad33482474e3429e0dcc074973a338fca Reviewed-on: https://code.wireshark.org/review/15992 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-20Pull the options structure initialization into commandline_other_options().Guy Harris1-15/+0
Change-Id: I931cde27a81566dfa0ce6e5c9307bfc1a4d5fe54 Reviewed-on: https://code.wireshark.org/review/16033 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-20GTK+: Truncate simple_message_box messages.Gerald Combs1-6/+28
In do_simple_message_box, build our primary message using g_string_vprintf instead of g_strdup_vprintf. Truncate both the primary and secondary messages so that we end up with merely annoyingly wide dialogs instead of insanely wide ones. Bug: 9761 Change-Id: I93ff76344c0da7d97cce5180ed9ecf9349190f6f Reviewed-on: https://code.wireshark.org/review/16005 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-20Add JSON export to Qt/GTK UIPascal Quantin3-3/+83
Change-Id: I5ff46a40cdb1f8f41565d2aa54c6f9e61d397e3a Reviewed-on: https://code.wireshark.org/review/16013 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-19Move some option checking to common code.Guy Harris1-47/+0
Change-Id: Icff9dacd73ea933c59ed664db05098dd8cb3dbf5 Reviewed-on: https://code.wireshark.org/review/16029 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-19Don't assume we successfully read the configuration files.Guy Harris1-1/+3
read_configuration_files() can fail and return NULL, so check that commandline_info.prefs_p is non-null before dereferencing it. Fixes CID 1362778. Change-Id: I3066769c474d394fbfe548b50d6be704964e59d3 Reviewed-on: https://code.wireshark.org/review/16028 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-19Pass the info strings directly to commandline_early_options().Guy Harris1-8/+6
Just pass them directly as arguments, don't stuff them into a structure. Change-Id: Iac84226f54898bc953011bca64795e9049762905 Reviewed-on: https://code.wireshark.org/review/16022 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-19Handle capture options in pcap-less Wireshark in the commandline_ routines.Guy Harris1-6/+0
Get rid of the capture_option_specified and arg_error members of the commandline_capture_param_info_t and commandline_param_info_t structures, and have them be local variables in commandline_early_options() and commandline_other_options(). Have commandline_early_options() print the "sorry, Wireshark wasn't built with pcap" and exit if -D was specified but Wireshark wasn't built with pcap. Change-Id: I0efcdea89d9585af8f3c0a28aee060f33d3ec5fd Reviewed-on: https://code.wireshark.org/review/16021 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-19Those aren't capture options, they're the options we must process early.Guy Harris1-1/+1
The only one of those options that has anything to do with packet capture is -i, and all we do there is check for an argument of "-"; the rest are either 1) options that affect your preference settings (-C to select the profile, -P to set the personal file directory path); 2) options that just print something to the standard output or error and exit, before firing up the GUI; 3) extension command line options (-X). Change-Id: Iba9b8b14fe468e2ca9d4c67e1a9b8103603678d9 Reviewed-on: https://code.wireshark.org/review/16019 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-19Get rid of an unused variable.Guy Harris1-1/+0
There's no need for the capture_option_specified variable; it's now in a structure. Change-Id: Ic2f1faee4666eea7ae91fd6899cecaa76d0ceb9f Reviewed-on: https://code.wireshark.org/review/16018 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-19Revert "tap: change glib functions to wmem."Pascal Quantin24-85/+89
This reverts commit 2e9f3c5d366eaa7139fc877b5301392166b3f985. It breaks the registration of codec, dissector and libwiretap plugins. Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de Reviewed-on: https://code.wireshark.org/review/16012 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-19Refactor command-line handling of GUI options.Michael Mann3-604/+85
Both GTK and Qt both use the same command-line options, so refactor the parsing and (possibly) applying of those arguments to a single location. Ping-Bug: 12546 Change-Id: Ib31e576c509c5d3d21c33d3247640d9f9c68661b Reviewed-on: https://code.wireshark.org/review/16006 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17tap: change glib functions to wmem.Dario Lombardo24-89/+85
Change-Id: I878ae6b121a669f9b7f4e1e57bc079f0cb44c0bf Reviewed-on: https://code.wireshark.org/review/15270 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16gtk: Check chunk before g_string_chunk_clearStig Bjørlykke1-1/+3
Avoid this warning from wireshark-gtk: (wireshark-gtk:39505): GLib-CRITICAL **: g_string_chunk_clear: assertion 'chunk != NULL' failed Change-Id: I413b3435a1ac595236dd1c4e619e3af1543b6a91 Reviewed-on: https://code.wireshark.org/review/15970 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16gtk: add initializer (CID 1362745).Dario Lombardo1-0/+1
Change-Id: Ib1bc11e905b0a4e84302e3f9ac43f3a87afd6edf Reviewed-on: https://code.wireshark.org/review/15954 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-06-15gtk: Fix null dereference in statsBalint Reczey1-1/+1
This fixes the bug reported to Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786704 Change-Id: Iabe19c11067318d78664a17fa00d6a4d1998250c Reviewed-on: https://code.wireshark.org/review/15948 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-15Remove Nmake build systemPascal Quantin2-177/+0
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-14addr_resolv: change g_hash to wmem_map.Dario Lombardo1-22/+21
Change-Id: Ice7533fbeac700dae0a46766838818a32b0d5736 Reviewed-on: https://code.wireshark.org/review/15051 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-14dcm: remove g_mallocDario Lombardo1-2/+2
Change-Id: I3d00b710c6fc6e5798ecc5eca9af11ccac920e5a Reviewed-on: https://code.wireshark.org/review/14913 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-14gtk: Allow restoring maximized windows as maximizedBalint Reczey1-2/+18
without losing window decorations on GNOME on the secondary monitor. Bug: 11303 Change-Id: Ie8f541dba9d49f9fe5d4892a8dc1cd42091afe1d Reviewed-on: https://code.wireshark.org/review/9077 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-14GTK: Disable liboverlay-scrollbar that crashed wireshark on UbuntuBalint Reczey1-0/+7
Bug: 11400 Change-Id: I40d901ab3ef43a61ef984014dabc0547605ef77c Reviewed-on: https://code.wireshark.org/review/15888 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-12Add checks to address setting routines.Guy Harris1-3/+1
Fail if: 1) you have an AT_NONE address with data; 2) you have a non-AT_NONE address with a zero length and a non-null data pointer, or with a non-zero length and a null data pointer. When comparing addresses for equality, just make sure the types are the same, the lengths are the same and, if the lengths are non-zero, the data is the same; don't treat AT_NONE specially - the "lengths are non-zero" check will make sure we do the right thing. Make sure when we create an AT_NONE address it has a zero length and null data pointer. Change-Id: I5c452ef0d140c2d9aef3004f1cfd124a95b78fb2 Reviewed-on: https://code.wireshark.org/review/15839 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-08Use separate main geometry settings for Qt and GTK+.Gerald Combs1-4/+4
Qt and GTK+ can have wildly different notions about the top-left position of the main window, particularly in multiple-screen configurations. For example, on OS X with the following monitor arrangment: g .---------. | | | | q--------.| | | |`---------' | | `--------' GTK+ positions windows relative to 'g' and Qt positions windows relative to 'q'. As a result it's easy for one UI to clobber the settings of the other. Split the geometry_main_x and geometry_main_y recent settings into Qt and GTK+ versions. In the Qt UI, try moving the main window onscreen before falling back to the default geometry. This keeps us from losing our size settings. Add a link to a Qt geometry bug. Change-Id: If7ae0dcc1719e646299ee3bbf1c88743f655c9a0 Ping-Bug: 12389 Reviewed-on: https://code.wireshark.org/review/15775 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-07pcap: Remove the WinPcap version checking for the Details dialogYang Luo1-37/+1
This check only works on the GTK UI's "Details" window. And it only can check version numbers. So there's no way for this code to be able to differentiate Npcap from WinPcap. And Npcap uses a very small version like "0.07", which makes itself not welcomed by this checking code. Change-Id: I861e9decd123e7d30547789c0488043616b17032 Reviewed-on: https://code.wireshark.org/review/15304 Reviewed-by: Yang Luo <hsluoyz@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-06*_stdup_printf -> strdup for "single string only" formatting.Michael Mann8-17/+17
Done for performance improvements. This could probably be done in checkAPIs.pl, but this was just a quick manual check with grepping. Change-Id: I91ff102cb528bb00fa2f65489de53890e7e46f2d Reviewed-on: https://code.wireshark.org/review/15751 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-06Add a routine to get an array of all instances of a string option.Guy Harris1-10/+17
Use it for OPT_COMMENT in the SHB, as there may be ore than one instance of OPT_COMMENT in an SHB. Also, use wtap_optionblock_get_option_string for OPT_SHB_HARDWARE, OPT_SHB_OS, and OPT_SHB_USERAPPL; they're specified as "only one instance allowed". Change-Id: I23ad87e41e40b7ae1155e96c0523a6f8caad5204 Reviewed-on: https://code.wireshark.org/review/15750 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-06Directly use wtap_opttypes calls to fetch SHB options.Guy Harris1-41/+63
Don't put them in the summary structure; the summary routines should calculate summary statistics, not dig up every bit of information that *could* appear in a summary. Instead, have the GUI code call wtap_file_get_shb() to get the SHB information and call wtap_optionblock_get_option_string() to fetch the option values. Move the option code definitions into wtap_opttypes.h, as they're used by the API. Change-Id: Icef11f5fb30fdc3df1bb0208aae9ed0aebaf0182 Reviewed-on: https://code.wireshark.org/review/15748 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-05Don't copy details of hidden columns.Michael Mann1-10/+13
Bug: 11788 Change-Id: I3f4df884d98903222de8a340de6a08e680687b0a Reviewed-on: https://code.wireshark.org/review/15727 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-03Qt: Add UTF-16 output to Follow Stream.Gerald Combs1-0/+1
Add an option to display the "follow" data as UTF-16. Bug: 237 Change-Id: Id95ffc014b8ef718f3b6e9f3415806ada309c3a2 Reviewed-on: https://code.wireshark.org/review/15702 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-01Qt: Firewall Rules dialog.Gerald Combs1-224/+28
Add the Firewall ACL Rules dialog. Try showing all valid rules for a given product instead of making the user select from a combobox. We can add the combo back easily enough if that's desired. Add a rule hint field and use it in the Qt and GTK+ UIs. Bug: 12469 Change-Id: I39dd840e9838f96d7c5e2b4c34662811c21d0386 Reviewed-on: https://code.wireshark.org/review/15689 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-01Add data structures necessary to support multiple Section Header blocks.Michael Mann1-2/+4
This doesn't try to use any data from multiple Section Header blocks, it just converts single Section Header block usage into a GArray, so the potential is there to then use/support multiple Section Header blocks within a file format (like pcapng) Change-Id: I6ad1f7b8daf4b1ad7ba0eb1ecf2e170421505486 Reviewed-on: https://code.wireshark.org/review/15636 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-01Allow create_tempfile to support a suffix.Michael Mann4-6/+6
Ping-Bug: 10203 Change-Id: Ifa24870d711449b87e9839dd46af614e4aa28fde Reviewed-on: https://code.wireshark.org/review/15608 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2016-05-22Add wtap_optionblock_set_option_string_formatMichael Mann1-9/+6
Also add a length parameter to wtap_optionblock_set_option_string Change-Id: I8c7bbc48aa96b5c2a91ab9a17980928d6894f1ee Reviewed-on: https://code.wireshark.org/review/15505 Reviewed-by: Anthony Coddington <anthony.coddington@endace.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-15GUI: Add shortcut for packet and capture commentUli Heilmeier1-2/+2
Added "Ctrl+Alt+C" as shortcut for packet comment. Added "Ctrl+Alt+Shift+C" as shortcut for capture comment (GTK) resp. for Capture File Properties (QT) Bug: 12410 Change-Id: I1ba61a38829c35f3bb166a94cda4bec3901c7ef1 Reviewed-on: https://code.wireshark.org/review/15300 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-05-10Have fvalue_to_string_repr always return an (wmem) allocated buffer.Michael Mann1-2/+2
Previous patches converted all fvalue_to_string_repr calls to expect an allocated buffer (and not a passed in one). Now changing signature to force an allocated buffer. Added wmem in case that can be taken advantage of within epan (and since the function signature was changing anyway). Change-Id: Ica1ac4a9a182ce0e73303856329e198d9d525b7b Reviewed-on: https://code.wireshark.org/review/15343 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-03Implement Export PDU for tsharkAndersBroman1-0/+1
This patch introduces the "-U tap_name[,filter]" tshark option and is similar to the "Export PDUs as file" option in Wireshark. Wireshark implements this feature by reopening a capture file, applying a tap and finally opening the temporary file. Since tshark knows in advance that a PDU export is needed, it can optimize by not creating the temporary file and perform the export at the first opportunity. This patch splits the opening/tapping functionality from error reporting since tshark does not need a temp file and has no dialogs. The capture file comment is now specified explicitly as there is no "current file" anymore if the tap is running without active file. TODO: - Review whether it is acceptable to overwrite save_file in tshark. - Add documentation (tshark manpage). Bug: 3444 Change-Id: Ie159495d42c32c2ba7400f2991b7b8185b3fda09 Reviewed-on: https://code.wireshark.org/review/5890 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-02Add checkAPI calls to CMake.Graham Bloice1-0/+21
This generates a top level target, checkAPI, that is excluded from the ALL build target, so must be run separately. On Windows using a Visual Studio generator, call msbuild /p:Configuration=RelWithDebInfo checkAPI.vcxproj Change-Id: I44a57c564dcfc75499463b942436f4b920a82478 Reviewed-on: https://code.wireshark.org/review/14873 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-04-21Link version code statically againJoão Valverde7-7/+7
This allows keeping the code-sharing with the static linking. This "fixes" a hypothetical ABI mismatch with wsutil and avoids pulling more external dependencies to wsutil than strictly necessary. A nice side-effect is that libwsutil no longer depends on version.h. Follow up to f95976eefcbeb5d24df383c29d29ef888b503945. Change-Id: I8f0d6a557ab3f7ce6f0e2c269124c89f29d6ad23 Reviewed-on: https://code.wireshark.org/review/15002 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-20Fix a typo causing pixbuf-csource.c not to be built if GDK_GRERESOURCEAndersBroman1-1/+1
does not exist. Change-Id: Ic6bc15d282f016965ef0da4e7574ef3a6080a6f8 Reviewed-on: https://code.wireshark.org/review/15013 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-19Remove "AirPcap" string for 802.11 medium on Windows because this medium can ↵hsluoyz1-3/+3
be provided by Npcap as well Change-Id: Ib7baca247a407101f44c5b610903f4a1293f9119 Reviewed-on: https://code.wireshark.org/review/15003 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-09[GTK] Check for xdg-open at run timeJoão Valverde1-84/+49
Remove HTML_VIEWER compile-time setting. If xdg-open doesn't exist use user web browser preference as fallback. Change-Id: I3b4a4a1a36b0192d75f2c97595f37d0d88a0941e Reviewed-on: https://code.wireshark.org/review/14805 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-06Qt: Follow stream performance improvements.Gerald Combs1-5/+8
Make FollowStreamText a subclass of QPlainTextEdit instead of QTextEdit. For large amounts of text, the former should be less unbearably slow than the latter. Increase the maximum stream size to 500MB. This isn't perfect but it's much more usable than 2MB and much easier than the next step, which is to write our own text display widget. Process UI events while we fill in the stream data. This gives us behavior similar to the GTK+ UI and is similar to what we do in other dialogs. Switch from g_memdup+g_free to a QByteArray in the Qt UI and GByteArray in the GTK+ UI. Don't call readStream twice. Make sure we free all of our stream data in the Qt UI. This fixes a serious memory leak. Ping-Bug: 11777 Change-Id: Ibad9bde86692ae07a80660566d1e661ab8b64601 Reviewed-on: https://code.wireshark.org/review/14271 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>