osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Move #defines for MENU_BAR_PATH_* and PACKET_LIST_POPUP_PATH_* out of 

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.


svn path=/trunk/; revision=38579
This commit is contained in:
Jörg Mayer 2011-08-17 14:19:25 +00:00
parent 2e95a6086d
commit b204b45400
2 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
gtk/main_filter_toolbar.c
View File

@ -51,6 +51,58 @@
#include "main_toolbar.h"
#include "main_filter_toolbar.h"
#ifdef MAIN_MENU_USE_UIMANAGER
# define MENU_BAR_PATH_FILE_OPEN "/Menubar/FileMenu/Open"
# define MENU_BAR_PATH_EDIT_COPY_AS_FLT "/Menubar/EditMenu/Copy/AsFilter"
# define MENU_BAR_PATH_ANALYZE_DISPLAY_FLT "/Menubar/AnalyzeMenu/DisplayFilters"
# define MENU_BAR_PATH_ANALYZE_FOLLOW_TCP_STREAM "/Menubar/AnalyzeMenu/FollowTCPStream"
# define MENU_BAR_PATH_ANALYZE_FOLLOW_UDP_STREAM "/Menubar/AnalyzeMenu/FollowUDPStream"
# define MENU_BAR_PATH_ANALYZE_FOLLOW_SSL_STREAM "/Menubar/AnalyzeMenu/FollowSSLStream"
# define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_SEL "/Menubar/AnalyzeMenu/ApplyAsFilter/Selected"
# define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_NOT_SEL "/Menubar/AnalyzeMenu/ApplyAsFilter/NotSelected"
# define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_AND_SEL "/Menubar/AnalyzeMenu/ApplyAsFilter/AndSelected"
# define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_OR_SEL "/Menubar/AnalyzeMenu/ApplyAsFilter/OrSelected"
# define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_AND_NOT_SEL "/Menubar/AnalyzeMenu/ApplyAsFilter/AndNotSelected"
# define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_OR_NOT_SEL "/Menubar/AnalyzeMenu/ApplyAsFilter/OrNotSelected"
# define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_SEL "/Menubar/AnalyzeMenu/PrepareaFilter/Selected"
# define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_NOT_SEL "/Menubar/AnalyzeMenu/PrepareaFilter/NotSelected"
# define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_AND_SEL "/Menubar/AnalyzeMenu/PrepareaFilter/AndSelected"
# define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_OR_SEL "/Menubar/AnalyzeMenu/PrepareaFilter/OrSelected"
# define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_AND_NOT_SEL "/Menubar/AnalyzeMenu/PrepareaFilter/AndNotSelected"
# define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_OR_NOT_SEL "/Menubar/AnalyzeMenu/PrepareaFilter/OrNotSelected"
#else
# define MENU_BAR_PATH_FILE_OPEN "/File/Open..."
# define MENU_BAR_PATH_EDIT_COPY_AS_FLT "/Edit/Copy/As Filter"
# define MENU_BAR_PATH_ANALYZE_DISPLAY_FLT "/Analyze/Display Filters..."
# define MENU_BAR_PATH_ANALYZE_FOLLOW_TCP_STREAM "/Analyze/Follow TCP Stream"
# define MENU_BAR_PATH_ANALYZE_FOLLOW_UDP_STREAM "/Analyze/Follow UDP Stream"
# define MENU_BAR_PATH_ANALYZE_FOLLOW_SSL_STREAM "/Analyze/Follow SSL Stream"
# define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_SEL "/Analyze/Apply as Filter/Selected"
# define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_NOT_SEL "/Analyze/Apply as Filter/Not Selected"
# define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_AND_SEL "/Analyze/Apply as Filter/... and Selected"
# define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_OR_SEL "/Analyze/Apply as Filter/... or Selected"
# define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_AND_NOT_SEL "/Analyze/Apply as Filter/... and not Selected"
# define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_OR_NOT_SEL "/Analyze/Apply as Filter/... or not Selected"
# define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_SEL "/Analyze/Prepare a Filter/Selected"
# define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_NOT_SEL "/Analyze/Prepare a Filter/Not Selected"
# define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_AND_SEL "/Analyze/Prepare a Filter/... and Selected"
# define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_OR_SEL "/Analyze/Prepare a Filter/... or Selected"
# define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_AND_NOT_SEL "/Analyze/Prepare a Filter/... and not Selected"
# define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_OR_NOT_SEL "/Analyze/Prepare a Filter/... or not Selected"
# endif /* MAIN_MENU_USE_UIMANAGER */
#if 0 /* Unused? */
# define PACKET_LIST_POPUP_PATH_ANALYZE_FOLLOW_TCP_STREAM "/PacketListMenuPopup/FollowTCPStream"
# define PACKET_LIST_POPUP_PATH_ANALYZE_FOLLOW_UDP_STREAM "/PacketListMenuPopup/FollowUDPStream"
# define PACKET_LIST_POPUP_PATH_ANALYZE_FOLLOW_SSL_STREAM "/PacketListMenuPopup/FollowSSLStream"
# define PACKET_LIST_POPUP_PATH_CONV_FLT_ETH "/PacketListMenuPopup/ConversationFilter/Ethernet"
# define PACKET_LIST_POPUP_PATH_CONV_FLT_IP "/PacketListMenuPopup/ConversationFilter/IP"
# define PACKET_LIST_POPUP_PATH_CONV_FLT_TCP "/PacketListMenuPopup/ConversationFilter/TCP"
# define PACKET_LIST_POPUP_PATH_CONV_FLT_UDP "/PacketListMenuPopup/ConversationFilter/UDP"
# define PACKET_LIST_POPUP_PATH_CONV_FLT_PN_CBA_SERV "/PacketListMenuPopup/ConversationFilter/PN-CBA"
#endif
GtkWidget *main_display_filter_widget=NULL;

53
gtk/menus.h
View File

@ -161,59 +161,6 @@ void set_menus_for_selected_packet(capture_file *cf);
/* Enable or disable menu items based on configuration profile */
void set_menus_for_profiles(gboolean default_profile);
#ifdef MAIN_MENU_USE_UIMANAGER
#define MENU_BAR_PATH_FILE_OPEN "/Menubar/FileMenu/Open"
#define MENU_BAR_PATH_EDIT_COPY_AS_FLT "/Menubar/EditMenu/Copy/AsFilter"
#define MENU_BAR_PATH_ANALYZE_DISPLAY_FLT "/Menubar/AnalyzeMenu/DisplayFilters"
#define MENU_BAR_PATH_ANALYZE_FOLLOW_TCP_STREAM "/Menubar/AnalyzeMenu/FollowTCPStream"
#define MENU_BAR_PATH_ANALYZE_FOLLOW_UDP_STREAM "/Menubar/AnalyzeMenu/FollowUDPStream"
#define MENU_BAR_PATH_ANALYZE_FOLLOW_SSL_STREAM "/Menubar/AnalyzeMenu/FollowSSLStream"
#define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_SEL "/Menubar/AnalyzeMenu/ApplyAsFilter/Selected"
#define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_NOT_SEL "/Menubar/AnalyzeMenu/ApplyAsFilter/NotSelected"
#define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_AND_SEL "/Menubar/AnalyzeMenu/ApplyAsFilter/AndSelected"
#define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_OR_SEL "/Menubar/AnalyzeMenu/ApplyAsFilter/OrSelected"
#define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_AND_NOT_SEL "/Menubar/AnalyzeMenu/ApplyAsFilter/AndNotSelected"
#define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_OR_NOT_SEL "/Menubar/AnalyzeMenu/ApplyAsFilter/OrNotSelected"
#define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_SEL "/Menubar/AnalyzeMenu/PrepareaFilter/Selected"
#define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_NOT_SEL "/Menubar/AnalyzeMenu/PrepareaFilter/NotSelected"
#define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_AND_SEL "/Menubar/AnalyzeMenu/PrepareaFilter/AndSelected"
#define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_OR_SEL "/Menubar/AnalyzeMenu/PrepareaFilter/OrSelected"
#define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_AND_NOT_SEL "/Menubar/AnalyzeMenu/PrepareaFilter/AndNotSelected"
#define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_OR_NOT_SEL "/Menubar/AnalyzeMenu/PrepareaFilter/OrNotSelected"
#else
#define MENU_BAR_PATH_FILE_OPEN "/File/Open..."
#define MENU_BAR_PATH_EDIT_COPY_AS_FLT "/Edit/Copy/As Filter"
#define MENU_BAR_PATH_ANALYZE_DISPLAY_FLT "/Analyze/Display Filters..."
#define MENU_BAR_PATH_ANALYZE_FOLLOW_TCP_STREAM "/Analyze/Follow TCP Stream"
#define MENU_BAR_PATH_ANALYZE_FOLLOW_UDP_STREAM "/Analyze/Follow UDP Stream"
#define MENU_BAR_PATH_ANALYZE_FOLLOW_SSL_STREAM "/Analyze/Follow SSL Stream"
#define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_SEL "/Analyze/Apply as Filter/Selected"
#define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_NOT_SEL "/Analyze/Apply as Filter/Not Selected"
#define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_AND_SEL "/Analyze/Apply as Filter/... and Selected"
#define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_OR_SEL "/Analyze/Apply as Filter/... or Selected"
#define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_AND_NOT_SEL "/Analyze/Apply as Filter/... and not Selected"
#define MENU_BAR_PATH_ANALYZE_APL_AS_FLT_OR_NOT_SEL "/Analyze/Apply as Filter/... or not Selected"
#define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_SEL "/Analyze/Prepare a Filter/Selected"
#define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_NOT_SEL "/Analyze/Prepare a Filter/Not Selected"
#define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_AND_SEL "/Analyze/Prepare a Filter/... and Selected"
#define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_OR_SEL "/Analyze/Prepare a Filter/... or Selected"
#define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_AND_NOT_SEL "/Analyze/Prepare a Filter/... and not Selected"
#define MENU_BAR_PATH_ANALYZE_PREP_A_FLT_OR_NOT_SEL "/Analyze/Prepare a Filter/... or not Selected"
#endif /* MAIN_MENU_USE_UIMANAGER */
#define PACKET_LIST_POPUP_PATH_ANALYZE_FOLLOW_TCP_STREAM "/PacketListMenuPopup/FollowTCPStream"
#define PACKET_LIST_POPUP_PATH_ANALYZE_FOLLOW_UDP_STREAM "/PacketListMenuPopup/FollowUDPStream"
#define PACKET_LIST_POPUP_PATH_ANALYZE_FOLLOW_SSL_STREAM "/PacketListMenuPopup/FollowSSLStream"
#define PACKET_LIST_POPUP_PATH_CONV_FLT_ETH "/PacketListMenuPopup/ConversationFilter/Ethernet"
#define PACKET_LIST_POPUP_PATH_CONV_FLT_IP "/PacketListMenuPopup/ConversationFilter/IP"
#define PACKET_LIST_POPUP_PATH_CONV_FLT_TCP "/PacketListMenuPopup/ConversationFilter/TCP"
#define PACKET_LIST_POPUP_PATH_CONV_FLT_UDP "/PacketListMenuPopup/ConversationFilter/UDP"
#define PACKET_LIST_POPUP_PATH_CONV_FLT_PN_CBA_SERV "/PacketListMenuPopup/ConversationFilter/PN-CBA"
#ifdef __cplusplus
}
#endif /* __cplusplus */