aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/main_filter_toolbar.c
AgeCommit message (Collapse)AuthorFilesLines
2011-09-25We now always build with MAIN_MENU_USE_UIMANAGER, so remove all code usingjmayer1-51/+18
the old ways except the proto_help.c file, which is kept for now in case someone is willing to reimplement the help menus using non-deprecated methods. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39137 f5534014-38df-0310-8fa8-9805f1628bb7
2011-09-08From Edwin Groothuis via bug 6207:stig1-6/+31
Added Filter Toolbar Save functionality. From me: Removed unused code. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38937 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-17menus.[hc]:jmayer1-40/+2
set_menu_object_data_old has identical parameters to set_menu_object_data, and one was used only in the MAIN_MENU_USE_UIMANAGER case, the other in the non MAIN_MENU_USE_UIMANAGER case. Differentiate inside the function code and not via the function name. main_filter_toolbar.c: Unify the set_menu_object_data and set_menu_object_data_old as the only difference was the function name. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38580 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-17Move #defines for MENU_BAR_PATH_* and PACKET_LIST_POPUP_PATH_* out ofjmayer1-0/+52
menus.h to main_filter_toolbar.c, that's the only place where they are used. The #defines for PACKET_LIST_POPUP_PATH_* seem to be unused, so #if 0 them. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38579 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-24Replace deprecated functions.etxrab1-5/+5
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38186 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-21Handle more stuff in old-gtk-compat.h to avoid guarding in the code.jmayer1-5/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38160 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-14Fix the last non-gtkitemfactory stuff for use with -DGTK_DISABLE_DEPRECATED.jmayer1-0/+5
Left are: gtk/menus.c:4382:5: error: ‘GtkItemFactoryEntry’ undeclared (first use in this function) gtk/menus.c:4382:26: error: ‘sep_entry’ undeclared (first use in this function) gtk/proto_help.c:79:16: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘*’ token gtk/proto_help.c:166:2: error: ‘g_ph_menu_factory’ undeclared (first use in this function) gtk/proto_help.c:166:2: error: implicit declaration of function ‘gtk_item_factory_from_widget’ gtk/proto_help.c:181:6: error: ‘g_ph_menu_factory’ undeclared (first use in this function) gtk/proto_help.c:183:2: error: implicit declaration of function ‘gtk_item_factory_get_widget’ gtk/proto_help.c:191:2: error: implicit declaration of function ‘gtk_item_factory_get_item’ gtk/proto_help.c:216:2: error: ‘GtkItemFactoryEntry’ undeclared (first use in this function) gtk/proto_help.c:216:23: error: ‘menu_entry’ undeclared (first use in this function) gtk/proto_help.c:217:2: error: ISO C90 forbids mixed declarations and code gtk/proto_help.c:222:6: error: ‘g_ph_menu_factory’ undeclared (first use in this function) gtk/proto_help.c:258:4: error: implicit declaration of function ‘gtk_item_factory_create_item’ git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38015 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-12Fix more tooltips.etxrab1-18/+6
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37987 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-12It's no longer neccesarry to set the E_DFILTER_TE_KEY on the popup_menu objects.etxrab1-16/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34486 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-10Fix up a number of callbacks.etxrab1-1/+46
Bug: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5288 requires abit of reworking of the callbacks or a different aproach to setting object data. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34453 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-30[GTKUImanager] Fix a few callbacks, use #defines for strings.etxrab1-23/+23
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34299 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-30Indicate that the selected display filter is applied by disabling the "Apply"stig1-0/+21
button. Indicate that no filter is applied by disabling the "Clear" button. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34288 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-23Remove #if 0'd out code (dfilter_combo_add_empty()).morriss1-9/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33891 f5534014-38df-0310-8fa8-9805f1628bb7
2010-07-07NEW_FILTER_COMBO_BOX no longer does anything - it's not checked for - soguy1-1/+0
there's no need to define it. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33469 f5534014-38df-0310-8fa8-9805f1628bb7
2010-07-07Remove the #ifdefs and code related to the switch to gtk_combo_box().etxrab1-91/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33465 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-08NEW_FILTER_COMBO_BOX: Make the Expression... button work again.morriss1-4/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33163 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-08NEW_FILTER_COMBO_BOX: dfilter_combo_add_empty() doesn't appear to be needed: ↵morriss1-1/+5
the entry field is empty even after populating thelist of recent filters. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33161 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-08dfilter_entry_match() (for NEW_FILTER_COMBO_BOX): unset value each time ↵morriss1-3/+4
through the loop to avoid duplicate initialization warnings from glib. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33160 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-07Rename the NEW_FILTER_COMBO_BOX routine dfilter_entry_match_new() toguy1-42/+43
dfilter_entry_match(), as the old dfilter_entry_match() isn't defined or used if NEW_FILTER_COMBO_BOX is defined. Clean up indentation a bit. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33154 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-07Don't define dfilter_entry_match() if we're using a combo box, as it'sguy1-35/+35
not used. Clean up indentation. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33148 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-07Declare dfilter_list only if we're going to use it.guy1-2/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33144 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-07Use NEW_FILTER_COMBO_BOX.etxrab1-1/+1
If there is no major problems the code can be cleaned up in a few days time. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33141 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-07Update the code for NEW_FILTER_COMBO_BOX.etxrab1-22/+30
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33140 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-11Initialize the GValues without triggering any warningsdimeg1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32767 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-11Make the changes compile on Linux also.jake1-3/+9
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32762 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-11Start to replace deprecated gtk_combo_new() withetxrab1-7/+82
gtk_combo_box_entry_new_text(). (I'll try to get back to this tomorrow) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32759 f5534014-38df-0310-8fa8-9805f1628bb7
2010-02-27Constify.guy1-90/+91
Don't have variables that point to string constants, just make the string constants be static const arrays. strlen(array of unspecified size initialized with a string) == sizeof array - 1; the latter can be computed at compile time. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32020 f5534014-38df-0310-8fa8-9805f1628bb7
2009-09-25Remove forgotten C++ style comments.etxrab1-3/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30137 f5534014-38df-0310-8fa8-9805f1628bb7
2009-09-25Make the filter toolbar style a preference.etxrab1-5/+9
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30136 f5534014-38df-0310-8fa8-9805f1628bb7
2009-09-24Get rid of some deprecated functions.etxrab1-24/+54
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30115 f5534014-38df-0310-8fa8-9805f1628bb7
2009-08-27Add #include <stdio.h> in a few more places for Solaris.wmeier1-2/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29577 f5534014-38df-0310-8fa8-9805f1628bb7
2009-06-21"main_menu.[ch]" -> "menus.[ch]"; it handles not only the main menu, butguy1-1/+1
context menus. Note why we have an empty hex dump pane context menu. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28794 f5534014-38df-0310-8fa8-9805f1628bb7
2009-06-01From Kovarththanan Rajaratnam via bug 3482:stig1-41/+37
Sort display filter list entries by usage. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28559 f5534014-38df-0310-8fa8-9805f1628bb7
2008-10-23Only use the statusbar for filter messages from the main window.stig1-0/+1
Updating the statusbar from popup windows is confusing. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26523 f5534014-38df-0310-8fa8-9805f1628bb7
2008-08-08From Kovarththanan Rajaratnam (Bug 2660):sake1-5/+4
Make display filter max recent entries a preference (From me: fixed an off by one bug in saving to the recent file) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25960 f5534014-38df-0310-8fa8-9805f1628bb7
2008-07-22Filter autocompletion from Bahaa Naamneh (bug 2581).martinm1-0/+4
There are still display filter controls where this isn't being used yet, but I'm committing it now so hopefully people can report any problems. Some commenting and formatting was done by myself. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25788 f5534014-38df-0310-8fa8-9805f1628bb7
2008-06-29From Kovarththanan Rajaratnam (bug 2657):sake1-2/+2
Resolve accelerator ambiguity in filter toolbar git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25633 f5534014-38df-0310-8fa8-9805f1628bb7
2008-06-15Moved setting of E_MPACKET_LIST_KEY object data to the function creatingstig1-1/+0
packet_list to ensure it's created before we set it. Applying filter from the packet list still doesn't work correctly. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25454 f5534014-38df-0310-8fa8-9805f1628bb7
2008-04-12various code cleanupulfl1-0/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24964 f5534014-38df-0310-8fa8-9805f1628bb7
2008-04-12Include string.hstig1-0/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24962 f5534014-38df-0310-8fa8-9805f1628bb7
2008-04-12move "filter toolbar" code from main.c into new file(s) main_filter_toolbarulfl1-0/+340
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24960 f5534014-38df-0310-8fa8-9805f1628bb7