aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/main_menubar.c
AgeCommit message (Collapse)AuthorFilesLines
2018-01-06Add ability for preferences to determine what they can change.Michael Mann1-7/+8
Add flags field to preference structure to help determine what areas of Wireshark are affected by a preference changing. The intent is to be able to distinguish dissection from GUI or other changes that are not dissection. The default is to have all preferences affect dissection, but their flags can be changed. This patch doesn't change any flags from the default. Change-Id: Ied5ae961bc3f33f5b730b2892fff3fa0898380b8 Reviewed-on: https://code.wireshark.org/review/25171 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-14Remove a plugin_if_gui_cb type conversion.Gerald Combs1-4/+3
We always pass a GHashTable * to plugin_if_gui_cb so don't cast it to a gconstpointer. This should fix the following and related warnings: main_window.cpp: In function ‘void plugin_if_mainwindow_apply_filter(gconstpointer)’: main_window.cpp:121:44: warning: cast from type ‘gconstpointer {aka const void*}’ to type ‘GHashTable* {aka _GHashTable*}’ casts away qualifiers [-Wcast-qual] GHashTable * data_set = (GHashTable *) user_data; Fix another const warning while we're here. Change-Id: Ia9225188bfb913feb4fef4369f10fd5791fc8dc9 Reviewed-on: https://code.wireshark.org/review/24830 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-24GTK: Remove packet editorJoão Valverde1-36/+0
Removes limited experimental feature for deprecated UI. Change-Id: Ib3ccfae89dd2a674ebbde346a442fa1cf6587f26 Reviewed-on: https://code.wireshark.org/review/24563 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-16GTK: Remove OSX integration library supportJoão Valverde1-93/+0
Only Wireshark Qt is officially supported on macOS. Change-Id: Id0e3429891173d4b91e99061bcf11df2e38bc0bf Reviewed-on: https://code.wireshark.org/review/23931 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>
2017-09-24GTK: Fix warning for missing actionJoão Valverde1-1/+0
(wireshark-gtk:17990): Gtk-WARNING **: 29WestUIMStreamFlowGraph: missing action /Statistics/29West/UIM/StreamFlowGraph Change-Id: I02bd6a172390ac072485cf2158b7c5205fd11ee2 Fixes: b5759cafae8f1cf852f39fe68accd126d40955cb Reviewed-on: https://code.wireshark.org/review/23678 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-20Integrate LBM UIM Flow dialog into "regular" Flow diagram.Michael Mann1-2/+0
Reduce all of the code duplication and just register the sequence analysis functionality in LBM dissector. Change-Id: I6cb5a7f0a92b04357334bbae301fa2d730a21994 Reviewed-on: https://code.wireshark.org/review/23630 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>
2017-06-20Fix filter for "Next Packet in Conversation"Peter Wu1-37/+2
The "Previous/Next Packet in Conversation" actions accidentally overwrites more specific filters (like TCP port matching) by less specific ones (like IP addresses). This resulted in strange behavior where packets from different TCP streams were selected. Change-Id: Ifa93064e1db3777fa3c12e2220bbb0b36b9478fe Reported-by: Christian Landström Reviewed-on: https://code.wireshark.org/review/22274 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-28GTK+Qt: Show Osmux Packet Counter on Telephony menuPau Espin Pedrol1-0/+5
Change-Id: I565b0d2d43dd98781f77a302a20bd841e3e4650e Reviewed-on: https://code.wireshark.org/review/21598 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>
2017-04-05A bunch of "{Mac} OS X" -> "macOS" changes.Guy Harris1-1/+1
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-06Switch conversations to use wmem_tree_t instead of (sorted) GSList.Michael Mann1-10/+12
Change-Id: Ifaf25ca5a7974f1d398ceebbb4c6733d4d3e001a Reviewed-on: https://code.wireshark.org/review/20006 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>
2017-02-08Switch export objects to use wmem_tree_t instead of (sorted) GSList.Michael Mann1-4/+5
Change-Id: Iaaa7b44954337c7857dbb541b727924e2de57c9d Reviewed-on: https://code.wireshark.org/review/20016 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-22Internalize struct preferenceMichael Mann1-66/+33
Move "struct preference" into prefs.c, essentially creating a "private" structure to handle preferences. The 2 motivating factors were: 1. Better memory management so that clients/users of API don't have to worry about it. 2. Hide the ugliness of the union stuff and make it transparent to the API. A few bugs related to preference <-> Decode As integration were fixed while in the neighborhood. Change-Id: I509b9a236235d066b139c98222b701475e0ed365 Reviewed-on: https://code.wireshark.org/review/19578 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-12-21GTK: fix Export Objects sub menu warningPascal Quantin1-2/+2
Change-Id: I513fd643a8c4849462ee6c4b296d86d04517b3db Reviewed-on: https://code.wireshark.org/review/19378 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>
2016-12-02Enable exporting objects with tsharkMoshe Kaplan1-12/+74
A new "--export-object <protocol>,<destdir>" option is added to tshark. This required refactoring Export Object behavior in all GUIs to give the export object handling to the dissector, rather than the ui layer. Included in the refactoring was fixing some serious memory leaks in Qt Export Object dialog, crash due to memory scope issues in GTK Export Object dialog, and addition sorting column feature in Qt dialog (set up by creating a widget to manage the items that were previously leaking memory) Bug: 9319 Ping-Bug: 13174 Change-Id: I515d7662fa1f150f672b1476716f347ec27deb9b Reviewed-on: https://code.wireshark.org/review/18927 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-30Have routines for parsing options that affect dissection.Guy Harris1-4/+5
Have them handle -d, -t, --disable-protocol, --disable-heuristic, and --enable-heuristic for TShark and both flavors of Wireshark. Change-Id: I612c276b1f9df8a2092202d23ab3d48be7857e85 Reviewed-on: https://code.wireshark.org/review/18583 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-01Qt+Gtk: Fix the -t command line flag.Gerald Combs1-3/+7
Add the time format to commandline_param_info_t and apply it when we've finished application initialization. Bug: 12489 Change-Id: Ice626198a610567e945a8e53c0c1093797e8208e Reviewed-on: https://code.wireshark.org/review/16232 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: Michael Mann <mmann78@netscape.net>
2016-06-20Add JSON export to Qt/GTK UIPascal Quantin1-0/+3
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-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-04-04Remove synchronous DNS name resolutionJoão Valverde1-2/+2
Change-Id: Ie5e670b769eb0674950f3679ef511047641c2873 Reviewed-on: https://code.wireshark.org/review/14751 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-11Remove the last remnants of U3 support.Gerald Combs1-6/+1
Change-Id: Ide4c177e67a77c5f9495b3b4c0f817f40e6dde30 Reviewed-on: https://code.wireshark.org/review/14425 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-01-12Refactor "Follow Stream" functionality on all GUI interfaces.Michael Mann1-4/+1
Create a "registration" system for Follow functionality so most of the work can be abstracted into a dissector and GUI can just be responsible for "display". This also removes the global variables in follow.c to open up multithreading possibilities. TCP, UDP and HTTP all have the same "tap interface" for Follow functionality (passing a tvb with byte data to "follow"). SSL still has it's own behavior, so Follow structures have to take that into account. TShark through the Follow registration now has support for HTTP. The only thing possibly missing is dynamic menu generation to further reduce explicit knowledge of Follow "type" (and rely on registration) Bug: 11988 Change-Id: I559d9ee1312406ad0986d4dce9fa67ea2103b339 Reviewed-on: https://code.wireshark.org/review/13161 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-03Add HTTP Follow streamMichael Mann1-3/+19
This automatically detects and decompresses HTTP along a TCP stream through the use of taps. Bug: 3528 Change-Id: I8ab832d509700d0da8eabf3c3e514d8511c598d3 Reviewed-on: https://code.wireshark.org/review/13009 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-28Refactor GUI dependencies out of color_filters.[ch] and move it to epan ↵Michael Mann1-3/+10
directory. This also moved color.h into color_filters.h Change-Id: Ic19e27aa1b3ec67e764aa7ee8bbef7b1187bb12e Reviewed-on: https://code.wireshark.org/review/12831 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-20Qt: Add missing multi-field column validationMichal Labedzki1-2/+2
GTK already has it, but Qt forgot about it, so multi-field custom column works ok if previously saved in GTK-shark. Invalid validation prevent from modifying and saving multi-field custom column in Qt version. While at it, rename "custom field" to "custom fields" to ensure we think about multi-field custom column. Change-Id: I99588150ccb38be11b75f5dd5b0f6443e7055ebb Reviewed-on: https://code.wireshark.org/review/12685 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-19Add menu item for capture comment dialog in GTK+Dirk1-9/+13
Qt already has a menu item for this in Statistics -> Capture File Properties Bug: 9628 Change-Id: I85dd6f85d43fbfb60c2f4db82d9a02d91866127c Reviewed-on: https://code.wireshark.org/review/12725 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-18Qt: use recent.gui_bytes_view preference to remember bits / byte viewPascal Quantin1-2/+2
While we are at it, let's centralize bytes_view_type definition Bug: 11903 Change-Id: I606c779a8efaea668db1b440d3ae0336e6e3fc67 Reviewed-on: https://code.wireshark.org/review/12706 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-18Provide routines to set string-like and range preferences from a string.Guy Harris1-14/+2
That gets rid of some duplicate code. Change-Id: I4b65c6c73929d18602f6b0425e4f3dbbabbf0127 Reviewed-on: https://code.wireshark.org/review/12713 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-29Move the definition of MAX_NUM_COLOR_CONVERSATION_COLORS.Guy Harris1-0/+2
It's only used by the GTK+ main menubar code, so put it there. I guess the Qt UI either doesn't have such a limit or defines it itself. Change-Id: I221be506ac40eee33514301db737ef7e22deb7a6 Reviewed-on: https://code.wireshark.org/review/11385 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-29"Color dissector filters" are just filters.Guy Harris1-66/+52
Rename the color_dissector_filters.[ch] files to just dissector_filters.[ch], and rename the routines not to include the string "color_", as those filters can be used as color filters *or* display filters. Remove "color_" from other places where we're not doing colorization. In the GTK+ code, combine the two loops that add menu items for filters in the dissector-provided filters list into one. Change-Id: I08ecccc6b1b1be675e4129a0589f36c9f240407c Reviewed-on: https://code.wireshark.org/review/11379 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-27Replace all "dissector filter" registrations with "dissector color filter" ↵Michael Mann1-12/+13
registration. In the GTK, there was "colorize" (via context menu using color_dissector_filter.{c,h}) or "not colorize" (via main menu using dissector_filters.{c,h}). In Qt, you have the option to colorize (via context menu using color_dissector_filter.{c,h}) or not colorize (via main menu using color_dissector_filter.{c,h}). Combine all into "colorize" and convert GTK to use color_dissector_filter.{c,h} in the "not colorize" main menu like Qt. Change-Id: Ib3ca1c822f5f66ab5b812632d808f7905b328483 Reviewed-on: https://code.wireshark.org/review/11263 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-20LTE dialogs: tidy up some loose endsMartin Mathieson1-2/+4
Change-Id: I18f099311f7660c91cffdf21bbacdb88b7c0fd7e Reviewed-on: https://code.wireshark.org/review/11182 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-10-05Move utf8_entities.h to wsutilJoão Valverde1-1/+1
Change-Id: I6298b3de5f0a1cb988014ff16082eaf8c2a3c3c0 Reviewed-on: https://code.wireshark.org/review/10786 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-09PluginIF: Fix GTK PluginIF interfaceRoland Knall1-0/+25
- Move the apply-filter code to main_menubar, because there already the code of the preference pop-ups is handled - Fix the apply-filter callback, which was not working at all Change-Id: I25d5a161d8b78695c15b3100653be36786129408 Reviewed-on: https://code.wireshark.org/review/10444 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-31Convert the MTP3 stats to new "generic stat API".Gerald Combs1-2/+1
Convert both the MTP3 statistics and summary. As with the GSM stats this is mostly untested. Change-Id: I7af8d5f21c8161dc95f7f2c710f32364b6f6a431 Reviewed-on: https://code.wireshark.org/review/10338 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-15Un-reference actions after adding them to an action group.Guy Harris1-6/+8
When created, they have a reference count of 1; when added to an action group, the reference count is increased as a pointer is held by the action group. Release the reference we got, as we're not holding onto it. Also, rename "menu_item" to "menu_action", to indicate that it's an action. Change-Id: I54543dcc2e6c3b341a9f584fe1b6099a134771b3 Reviewed-on: https://code.wireshark.org/review/10049 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-15Do the "plugin" menu stuff in one pass.Guy Harris1-66/+25
Also, use g_strconcat() in other places where we prepend / to action names. Hopefully, this will make it easier to find common code between all the N different places where we add menus and menu items. Change-Id: Iee876866730cada64428df17f1f3c4552cc3ac93 Reviewed-on: https://code.wireshark.org/review/10048 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-15Fix creation of menu actions in ws_menubar_create_action_group().Guy Harris1-2/+7
Action names are expected to begin with /, so prepend a /. Fixes the "plugin" menu mechanism (which could be used by built-in code as well, so it's not really a "plugin" menu mechanism). Change-Id: Ic45412399078796359649cc876d2c8bfc9a790c6 Reviewed-on: https://code.wireshark.org/review/10046 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-07Add ONC RPC program stats.Gerald Combs1-2/+0
Convert ONC RPC program stats to the stat_tap API. Add a "user_data" member to the stat_tap_table_item_type struct. Change-Id: I5cbf000a447ff93d30fa7f098124bdcbc34f2935 Reviewed-on: https://code.wireshark.org/review/9904 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-06Convert the GSM MAP stats to new "generic stat API".Gerald Combs1-2/+0
Convert both the MAP statistics and summary. As with the GSM A stats this are mostly untested. Change-Id: Ibd3a7346b09d1401e78724c0197ec2a38deb97a3 Reviewed-on: https://code.wireshark.org/review/9883 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-04Convert the GSM A stats to new "generic stat API".Gerald Combs1-25/+0
These are largely untested, but the two abis captures on the wiki seem to work OK. The menu item names could also use some work. Patches welcome. Change-Id: I19a5b5fe3476b49d1dd0b684cbb7f367c6ebd4b4 Reviewed-on: https://code.wireshark.org/review/9869 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-16Add the RTP Stream Analysis dialog.Gerald Combs1-1/+1
Combine the GTK+ RTP Stream Analysis and RTP Graph Analysis dialogs into one. Yell at the user less. Disable the Analyze RTP Stream menu item if we don't have an RTP stream selected. There are a *lot* of moving parts in this dialog. I've tested with the few RTP captures I have but it's by no means complete. "To do" items are listed at the top of rtp_analysis.cpp. Change-Id: Id503977f069bebc46cc68bc749f0c9cbf4d37bf6 Reviewed-on: https://code.wireshark.org/review/9650 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-08GTK+: Add a Telephony/ANSI menu placeholder.Gerald Combs1-3/+7
Add REGISTER_STAT_GROUP_TELEPHONY_ANSI as well, and use it to add recently updated stats. Make sure we properly escape our path separators. Change-Id: I979d5c29a82acddec1a9bcae7e3cb9c5ea3f9d33 Reviewed-on: https://code.wireshark.org/review/9564 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-03Create very basic "generic" stat tap API to create a "GUI" independent table.Michael Mann1-10/+0
A few sample tap/dissectors (ANSI/A, ANSI MAP) are also included to test the API. The "GUI output" is a bit raw and could use some "prettying up", but all the basic hooks are there. Telephony "stat grouping" needs to be better alphabetized to properly populate menu (on GTK, probably Qt) Change-Id: I98514171f69c4ab3a304dccb26c71d629703c9ab Reviewed-on: https://code.wireshark.org/review/9110 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-29gtk: Fix use-after-free on removing recent filePeter Wu1-2/+3
Change-Id: I930b0522d116d53aeef366ae0b43f818b9a81d7f Reviewed-on: https://code.wireshark.org/review/9211 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-25Plugin Interface: Add GUI callbacksRoland Knall1-1/+1
Rename ext_menubar to a more appropriate plugin_if. External menus can be implemented by plugins to present additional menus for deep-packet analysis. One side-effect of such menus being implemented as plugins is, that they are being executed in different threads and therefore can only use limited access to the main GUI. Also, there is no safe cross-gui (GTK and Qt) way for many features. This patch implements a first functionality, by which a plugin implemented using ext_menubar can apply a display filter to the main view. For now the implementation supports filtering, as well as saving a preference. Change-Id: Iffe4caa954bbeb8ce356352de4dae348a50efba9 Reviewed-on: https://code.wireshark.org/review/8773 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-20Get rid of XML step for adding menubar items.Guy Harris1-175/+122
And don't create extra action groups; just add them to the main menubar's action group. Rename add_menu_item() to add_menu_item_to_main_menubar() to make that clearer. Change-Id: I6b564620decd8d0c9c4a2cb79b1a03df5ff27a4b Reviewed-on: https://code.wireshark.org/review/8555 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-20Have an add_menu_item() to add items to the menu bar, and use it.Guy Harris1-180/+143
Have it contain all the code to add an item to the menu bar; we may be able to get rid of the "construct the XML"/"have GTK+ parse the UI" code in favor of code that directly does the actions to add the item to the menu without the intermediate XML. Use it for both the items registered with register_menu_bar_menu_items() and for the items registered with the new external menu mechanism. Change-Id: Ibcac03173580bb83ae46cde1d1435f71767d8355 Reviewed-on: https://code.wireshark.org/review/8544 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-16Main (menubar): fix C++ style comments are not allowed in ISO C90Alexis La Goutte1-1/+1
Change-Id: Ia8ae6780027a63c4a88ea8d2a10ba1e0f8931f25 Reviewed-on: https://code.wireshark.org/review/8472 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-13Change the formatting strings used to create the Conversation Filter submenuMichael Mann1-7/+12
Bug: 11178 Change-Id: I4a5ae1399da8206efb29c059437d56da06a539a9 Reviewed-on: https://code.wireshark.org/review/8417 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: Evan Huus <eapache@gmail.com>
2015-05-08A NULL is needed at the end of the argument list for g_object_set().Guy Harris1-1/+1
Change-Id: I086403275d596f19ef44374f956654cf94ac9a11 Reviewed-on: https://code.wireshark.org/review/8343 Reviewed-by: Guy Harris <guy@alum.mit.edu>