diff options
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | Makefile.am | 16 | ||||
-rw-r--r-- | Makefile.nmake | 34 | ||||
-rw-r--r-- | configure.in | 6 | ||||
-rw-r--r-- | epan/plugins.c | 2 | ||||
-rw-r--r-- | epan/timestamp.c | 2 | ||||
-rw-r--r-- | file.c | 2 | ||||
-rw-r--r-- | packaging/nsis/wireshark.nsi | 2 | ||||
-rw-r--r-- | tap-megaco-common.h | 4 | ||||
-rw-r--r-- | tap-rtp-common.c | 4 | ||||
-rw-r--r-- | tap-rtp-common.h | 4 | ||||
-rw-r--r-- | tap-rtp.c | 2 | ||||
-rw-r--r-- | tap-sipstat.c | 10 | ||||
-rw-r--r-- | ui/gtk/CMakeLists.txt (renamed from gtk/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | ui/gtk/Makefile.am (renamed from gtk/Makefile.am) | 0 | ||||
-rw-r--r-- | ui/gtk/Makefile.common (renamed from gtk/Makefile.common) | 0 | ||||
-rw-r--r-- | ui/gtk/Makefile.nmake (renamed from gtk/Makefile.nmake) | 0 | ||||
-rw-r--r-- | ui/gtk/Makefile_custom.common (renamed from gtk/Makefile_custom.common) | 0 | ||||
-rw-r--r-- | ui/gtk/STATUS.gtk3 (renamed from gtk/STATUS.gtk3) | 2 | ||||
-rw-r--r-- | ui/gtk/about_dlg.c (renamed from gtk/about_dlg.c) | 16 | ||||
-rw-r--r-- | ui/gtk/about_dlg.h (renamed from gtk/about_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/afp_stat.c (renamed from gtk/afp_stat.c) | 12 | ||||
-rw-r--r-- | ui/gtk/airpcap_dlg.c (renamed from gtk/airpcap_dlg.c) | 18 | ||||
-rw-r--r-- | ui/gtk/airpcap_dlg.h (renamed from gtk/airpcap_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/airpcap_gui_utils.c (renamed from gtk/airpcap_gui_utils.c) | 14 | ||||
-rw-r--r-- | ui/gtk/airpcap_gui_utils.h (renamed from gtk/airpcap_gui_utils.h) | 0 | ||||
-rw-r--r-- | ui/gtk/ansi_a_stat.c (renamed from gtk/ansi_a_stat.c) | 10 | ||||
-rw-r--r-- | ui/gtk/ansi_map_stat.c (renamed from gtk/ansi_map_stat.c) | 10 | ||||
-rw-r--r-- | ui/gtk/bootp_stat.c (renamed from gtk/bootp_stat.c) | 10 | ||||
-rw-r--r-- | ui/gtk/camel_counter.c (renamed from gtk/camel_counter.c) | 12 | ||||
-rw-r--r-- | ui/gtk/camel_srt.c (renamed from gtk/camel_srt.c) | 16 | ||||
-rw-r--r-- | ui/gtk/capture_dlg.c (renamed from gtk/capture_dlg.c) | 40 | ||||
-rw-r--r-- | ui/gtk/capture_dlg.h (renamed from gtk/capture_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/capture_file_dlg.c (renamed from gtk/capture_file_dlg.c) | 34 | ||||
-rw-r--r-- | ui/gtk/capture_file_dlg.h (renamed from gtk/capture_file_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/capture_globals.h (renamed from gtk/capture_globals.h) | 0 | ||||
-rw-r--r-- | ui/gtk/capture_if_details_dlg_win32.c (renamed from gtk/capture_if_details_dlg_win32.c) | 10 | ||||
-rw-r--r-- | ui/gtk/capture_if_details_dlg_win32.h (renamed from gtk/capture_if_details_dlg_win32.h) | 0 | ||||
-rw-r--r-- | ui/gtk/capture_if_dlg.c (renamed from gtk/capture_if_dlg.c) | 38 | ||||
-rw-r--r-- | ui/gtk/capture_if_dlg.h (renamed from gtk/capture_if_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/capture_info_dlg.c (renamed from gtk/capture_info_dlg.c) | 10 | ||||
-rw-r--r-- | ui/gtk/cfilter_combo_utils.c (renamed from gtk/cfilter_combo_utils.c) | 8 | ||||
-rw-r--r-- | ui/gtk/cfilter_combo_utils.h (renamed from gtk/cfilter_combo_utils.h) | 0 | ||||
-rw-r--r-- | ui/gtk/color_dlg.c (renamed from gtk/color_dlg.c) | 26 | ||||
-rw-r--r-- | ui/gtk/color_dlg.h (renamed from gtk/color_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/color_edit_dlg.c (renamed from gtk/color_edit_dlg.c) | 22 | ||||
-rw-r--r-- | ui/gtk/color_edit_dlg.h (renamed from gtk/color_edit_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/color_utils.c (renamed from gtk/color_utils.c) | 4 | ||||
-rw-r--r-- | ui/gtk/color_utils.h (renamed from gtk/color_utils.h) | 0 | ||||
-rw-r--r-- | ui/gtk/compare_stat.c (renamed from gtk/compare_stat.c) | 10 | ||||
-rw-r--r-- | ui/gtk/conversations_eth.c (renamed from gtk/conversations_eth.c) | 4 | ||||
-rw-r--r-- | ui/gtk/conversations_fc.c (renamed from gtk/conversations_fc.c) | 4 | ||||
-rw-r--r-- | ui/gtk/conversations_fddi.c (renamed from gtk/conversations_fddi.c) | 4 | ||||
-rw-r--r-- | ui/gtk/conversations_ip.c (renamed from gtk/conversations_ip.c) | 4 | ||||
-rw-r--r-- | ui/gtk/conversations_ipv6.c (renamed from gtk/conversations_ipv6.c) | 4 | ||||
-rw-r--r-- | ui/gtk/conversations_ipx.c (renamed from gtk/conversations_ipx.c) | 4 | ||||
-rw-r--r-- | ui/gtk/conversations_jxta.c (renamed from gtk/conversations_jxta.c) | 4 | ||||
-rw-r--r-- | ui/gtk/conversations_ncp.c (renamed from gtk/conversations_ncp.c) | 4 | ||||
-rw-r--r-- | ui/gtk/conversations_rsvp.c (renamed from gtk/conversations_rsvp.c) | 4 | ||||
-rw-r--r-- | ui/gtk/conversations_sctp.c (renamed from gtk/conversations_sctp.c) | 4 | ||||
-rw-r--r-- | ui/gtk/conversations_table.c (renamed from gtk/conversations_table.c) | 26 | ||||
-rw-r--r-- | ui/gtk/conversations_table.h (renamed from gtk/conversations_table.h) | 0 | ||||
-rw-r--r-- | ui/gtk/conversations_tcpip.c (renamed from gtk/conversations_tcpip.c) | 4 | ||||
-rw-r--r-- | ui/gtk/conversations_tr.c (renamed from gtk/conversations_tr.c) | 4 | ||||
-rw-r--r-- | ui/gtk/conversations_udpip.c (renamed from gtk/conversations_udpip.c) | 4 | ||||
-rw-r--r-- | ui/gtk/conversations_usb.c (renamed from gtk/conversations_usb.c) | 4 | ||||
-rw-r--r-- | ui/gtk/conversations_wlan.c (renamed from gtk/conversations_wlan.c) | 4 | ||||
-rw-r--r-- | ui/gtk/dcerpc_stat.c (renamed from gtk/dcerpc_stat.c) | 22 | ||||
-rw-r--r-- | ui/gtk/decode_as_ber.c (renamed from gtk/decode_as_ber.c) | 10 | ||||
-rw-r--r-- | ui/gtk/decode_as_ber.h (renamed from gtk/decode_as_ber.h) | 0 | ||||
-rw-r--r-- | ui/gtk/decode_as_dcerpc.c (renamed from gtk/decode_as_dcerpc.c) | 8 | ||||
-rw-r--r-- | ui/gtk/decode_as_dcerpc.h (renamed from gtk/decode_as_dcerpc.h) | 0 | ||||
-rw-r--r-- | ui/gtk/decode_as_dlg.c (renamed from gtk/decode_as_dlg.c) | 14 | ||||
-rw-r--r-- | ui/gtk/decode_as_dlg.h (renamed from gtk/decode_as_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/dfilter_expr_dlg.c (renamed from gtk/dfilter_expr_dlg.c) | 16 | ||||
-rw-r--r-- | ui/gtk/dfilter_expr_dlg.h (renamed from gtk/dfilter_expr_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/diameter_stat.c (renamed from gtk/diameter_stat.c) | 16 | ||||
-rw-r--r-- | ui/gtk/dissector_tables_dlg.c (renamed from gtk/dissector_tables_dlg.c) | 6 | ||||
-rw-r--r-- | ui/gtk/dissector_tables_dlg.h (renamed from gtk/dissector_tables_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/dlg_utils.c (renamed from gtk/dlg_utils.c) | 8 | ||||
-rw-r--r-- | ui/gtk/dlg_utils.h (renamed from gtk/dlg_utils.h) | 0 | ||||
-rw-r--r-- | ui/gtk/doxygen.cfg.in (renamed from gtk/doxygen.cfg.in) | 0 | ||||
-rw-r--r-- | ui/gtk/drag_and_drop.c (renamed from gtk/drag_and_drop.c) | 14 | ||||
-rw-r--r-- | ui/gtk/drag_and_drop.h (renamed from gtk/drag_and_drop.h) | 0 | ||||
-rw-r--r-- | ui/gtk/expert_comp_dlg.c (renamed from gtk/expert_comp_dlg.c) | 22 | ||||
-rw-r--r-- | ui/gtk/expert_comp_dlg.h (renamed from gtk/expert_comp_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/expert_comp_table.c (renamed from gtk/expert_comp_table.c) | 24 | ||||
-rw-r--r-- | ui/gtk/expert_comp_table.h (renamed from gtk/expert_comp_table.h) | 0 | ||||
-rw-r--r-- | ui/gtk/expert_indicators.h (renamed from gtk/expert_indicators.h) | 0 | ||||
-rw-r--r-- | ui/gtk/export_object.c (renamed from gtk/export_object.c) | 14 | ||||
-rw-r--r-- | ui/gtk/export_object.h (renamed from gtk/export_object.h) | 0 | ||||
-rw-r--r-- | ui/gtk/export_object_dicom.c (renamed from gtk/export_object_dicom.c) | 2 | ||||
-rw-r--r-- | ui/gtk/export_object_http.c (renamed from gtk/export_object_http.c) | 2 | ||||
-rw-r--r-- | ui/gtk/export_object_smb.c (renamed from gtk/export_object_smb.c) | 2 | ||||
-rw-r--r-- | ui/gtk/export_sslkeys.c (renamed from gtk/export_sslkeys.c) | 26 | ||||
-rw-r--r-- | ui/gtk/export_sslkeys.h (renamed from gtk/export_sslkeys.h) | 0 | ||||
-rw-r--r-- | ui/gtk/fc_stat.c (renamed from gtk/fc_stat.c) | 16 | ||||
-rw-r--r-- | ui/gtk/file_dlg.c (renamed from gtk/file_dlg.c) | 8 | ||||
-rw-r--r-- | ui/gtk/file_dlg.h (renamed from gtk/file_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/file_import_dlg.c (renamed from gtk/file_import_dlg.c) | 22 | ||||
-rw-r--r-- | ui/gtk/file_import_dlg.h (renamed from gtk/file_import_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/fileset_dlg.c (renamed from gtk/fileset_dlg.c) | 12 | ||||
-rw-r--r-- | ui/gtk/fileset_dlg.h (renamed from gtk/fileset_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/filter_autocomplete.c (renamed from gtk/filter_autocomplete.c) | 6 | ||||
-rw-r--r-- | ui/gtk/filter_autocomplete.h (renamed from gtk/filter_autocomplete.h) | 0 | ||||
-rw-r--r-- | ui/gtk/filter_dlg.c (renamed from gtk/filter_dlg.c) | 22 | ||||
-rw-r--r-- | ui/gtk/filter_dlg.h (renamed from gtk/filter_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/filter_expression_save_dlg.c (renamed from gtk/filter_expression_save_dlg.c) | 18 | ||||
-rw-r--r-- | ui/gtk/filter_expression_save_dlg.h (renamed from gtk/filter_expression_save_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/filter_utils.c (renamed from gtk/filter_utils.c) | 12 | ||||
-rw-r--r-- | ui/gtk/filter_utils.h (renamed from gtk/filter_utils.h) | 0 | ||||
-rw-r--r-- | ui/gtk/find_dlg.c (renamed from gtk/find_dlg.c) | 20 | ||||
-rw-r--r-- | ui/gtk/find_dlg.h (renamed from gtk/find_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/firewall_dlg.c (renamed from gtk/firewall_dlg.c) | 14 | ||||
-rw-r--r-- | ui/gtk/firewall_dlg.h (renamed from gtk/firewall_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/flow_graph.c (renamed from gtk/flow_graph.c) | 14 | ||||
-rw-r--r-- | ui/gtk/follow_ssl.c (renamed from gtk/follow_ssl.c) | 20 | ||||
-rw-r--r-- | ui/gtk/follow_ssl.h (renamed from gtk/follow_ssl.h) | 0 | ||||
-rw-r--r-- | ui/gtk/follow_stream.c (renamed from gtk/follow_stream.c) | 20 | ||||
-rw-r--r-- | ui/gtk/follow_stream.h (renamed from gtk/follow_stream.h) | 0 | ||||
-rw-r--r-- | ui/gtk/follow_tcp.c (renamed from gtk/follow_tcp.c) | 22 | ||||
-rw-r--r-- | ui/gtk/follow_tcp.h (renamed from gtk/follow_tcp.h) | 0 | ||||
-rw-r--r-- | ui/gtk/follow_udp.c (renamed from gtk/follow_udp.c) | 10 | ||||
-rw-r--r-- | ui/gtk/follow_udp.h (renamed from gtk/follow_udp.h) | 0 | ||||
-rw-r--r-- | ui/gtk/font_utils.c (renamed from gtk/font_utils.c) | 14 | ||||
-rw-r--r-- | ui/gtk/font_utils.h (renamed from gtk/font_utils.h) | 0 | ||||
-rw-r--r-- | ui/gtk/funnel_stat.c (renamed from gtk/funnel_stat.c) | 18 | ||||
-rw-r--r-- | ui/gtk/goto_dlg.c (renamed from gtk/goto_dlg.c) | 8 | ||||
-rw-r--r-- | ui/gtk/goto_dlg.h (renamed from gtk/goto_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/graph_analysis.c (renamed from gtk/graph_analysis.c) | 46 | ||||
-rw-r--r-- | ui/gtk/graph_analysis.h (renamed from gtk/graph_analysis.h) | 0 | ||||
-rw-r--r-- | ui/gtk/gsm_a_stat.c (renamed from gtk/gsm_a_stat.c) | 10 | ||||
-rw-r--r-- | ui/gtk/gsm_map_stat.c (renamed from gtk/gsm_map_stat.c) | 12 | ||||
-rw-r--r-- | ui/gtk/gsm_map_stat.h (renamed from gtk/gsm_map_stat.h) | 0 | ||||
-rw-r--r-- | ui/gtk/gsm_map_summary.c (renamed from gtk/gsm_map_summary.c) | 8 | ||||
-rw-r--r-- | ui/gtk/gtkglobals.h (renamed from gtk/gtkglobals.h) | 0 | ||||
-rw-r--r-- | ui/gtk/gtp_stat.c (renamed from gtk/gtp_stat.c) | 16 | ||||
-rw-r--r-- | ui/gtk/gui_stat_menu.h (renamed from gtk/gui_stat_menu.h) | 0 | ||||
-rw-r--r-- | ui/gtk/gui_stat_util.c (renamed from gtk/gui_stat_util.c) | 2 | ||||
-rw-r--r-- | ui/gtk/gui_stat_util.h (renamed from gtk/gui_stat_util.h) | 0 | ||||
-rw-r--r-- | ui/gtk/gui_utils.c (renamed from gtk/gui_utils.c) | 10 | ||||
-rw-r--r-- | ui/gtk/gui_utils.h (renamed from gtk/gui_utils.h) | 0 | ||||
-rw-r--r-- | ui/gtk/h225_counter.c (renamed from gtk/h225_counter.c) | 12 | ||||
-rw-r--r-- | ui/gtk/h225_ras_srt.c (renamed from gtk/h225_ras_srt.c) | 12 | ||||
-rw-r--r-- | ui/gtk/help_dlg.c (renamed from gtk/help_dlg.c) | 12 | ||||
-rw-r--r-- | ui/gtk/help_dlg.h (renamed from gtk/help_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/hostlist_eth.c (renamed from gtk/hostlist_eth.c) | 4 | ||||
-rw-r--r-- | ui/gtk/hostlist_fc.c (renamed from gtk/hostlist_fc.c) | 4 | ||||
-rw-r--r-- | ui/gtk/hostlist_fddi.c (renamed from gtk/hostlist_fddi.c) | 4 | ||||
-rw-r--r-- | ui/gtk/hostlist_ip.c (renamed from gtk/hostlist_ip.c) | 4 | ||||
-rw-r--r-- | ui/gtk/hostlist_ipv6.c (renamed from gtk/hostlist_ipv6.c) | 4 | ||||
-rw-r--r-- | ui/gtk/hostlist_ipx.c (renamed from gtk/hostlist_ipx.c) | 4 | ||||
-rw-r--r-- | ui/gtk/hostlist_jxta.c (renamed from gtk/hostlist_jxta.c) | 4 | ||||
-rw-r--r-- | ui/gtk/hostlist_ncp.c (renamed from gtk/hostlist_ncp.c) | 4 | ||||
-rw-r--r-- | ui/gtk/hostlist_rsvp.c (renamed from gtk/hostlist_rsvp.c) | 4 | ||||
-rw-r--r-- | ui/gtk/hostlist_sctp.c (renamed from gtk/hostlist_sctp.c) | 4 | ||||
-rw-r--r-- | ui/gtk/hostlist_table.c (renamed from gtk/hostlist_table.c) | 24 | ||||
-rw-r--r-- | ui/gtk/hostlist_table.h (renamed from gtk/hostlist_table.h) | 0 | ||||
-rw-r--r-- | ui/gtk/hostlist_tcpip.c (renamed from gtk/hostlist_tcpip.c) | 4 | ||||
-rw-r--r-- | ui/gtk/hostlist_tr.c (renamed from gtk/hostlist_tr.c) | 4 | ||||
-rw-r--r-- | ui/gtk/hostlist_udpip.c (renamed from gtk/hostlist_udpip.c) | 4 | ||||
-rw-r--r-- | ui/gtk/hostlist_usb.c (renamed from gtk/hostlist_usb.c) | 4 | ||||
-rw-r--r-- | ui/gtk/hostlist_wlan.c (renamed from gtk/hostlist_wlan.c) | 4 | ||||
-rw-r--r-- | ui/gtk/iax2_analysis.c (renamed from gtk/iax2_analysis.c) | 26 | ||||
-rw-r--r-- | ui/gtk/iax2_analysis.h (renamed from gtk/iax2_analysis.h) | 0 | ||||
-rw-r--r-- | ui/gtk/io_stat.c (renamed from gtk/io_stat.c) | 24 | ||||
-rw-r--r-- | ui/gtk/keys.h (renamed from gtk/keys.h) | 0 | ||||
-rw-r--r-- | ui/gtk/ldap_stat.c (renamed from gtk/ldap_stat.c) | 16 | ||||
-rw-r--r-- | ui/gtk/libui.vcproj (renamed from gtk/libui.vcproj) | 0 | ||||
-rw-r--r-- | ui/gtk/mac_lte_stat_dlg.c (renamed from gtk/mac_lte_stat_dlg.c) | 16 | ||||
-rw-r--r-- | ui/gtk/macros_dlg.c (renamed from gtk/macros_dlg.c) | 6 | ||||
-rw-r--r-- | ui/gtk/macros_dlg.h (renamed from gtk/macros_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/main.c (renamed from gtk/main.c) | 78 | ||||
-rw-r--r-- | ui/gtk/main.h (renamed from gtk/main.h) | 0 | ||||
-rw-r--r-- | ui/gtk/main_airpcap_toolbar.c (renamed from gtk/main_airpcap_toolbar.c) | 2 | ||||
-rw-r--r-- | ui/gtk/main_airpcap_toolbar.h (renamed from gtk/main_airpcap_toolbar.h) | 0 | ||||
-rw-r--r-- | ui/gtk/main_filter_toolbar.c (renamed from gtk/main_filter_toolbar.c) | 2 | ||||
-rw-r--r-- | ui/gtk/main_filter_toolbar.h (renamed from gtk/main_filter_toolbar.h) | 0 | ||||
-rw-r--r-- | ui/gtk/main_menubar.c (renamed from gtk/main_menubar.c) | 106 | ||||
-rw-r--r-- | ui/gtk/main_proto_draw.c (renamed from gtk/main_proto_draw.c) | 26 | ||||
-rw-r--r-- | ui/gtk/main_proto_draw.h (renamed from gtk/main_proto_draw.h) | 0 | ||||
-rw-r--r-- | ui/gtk/main_statusbar.c (renamed from gtk/main_statusbar.c) | 22 | ||||
-rw-r--r-- | ui/gtk/main_statusbar_private.h (renamed from gtk/main_statusbar_private.h) | 0 | ||||
-rw-r--r-- | ui/gtk/main_toolbar.c (renamed from gtk/main_toolbar.c) | 40 | ||||
-rw-r--r-- | ui/gtk/main_toolbar.h (renamed from gtk/main_toolbar.h) | 0 | ||||
-rw-r--r-- | ui/gtk/main_welcome.c (renamed from gtk/main_welcome.c) | 32 | ||||
-rw-r--r-- | ui/gtk/main_welcome.h (renamed from gtk/main_welcome.h) | 2 | ||||
-rw-r--r-- | ui/gtk/manual_addr_resolv.c (renamed from gtk/manual_addr_resolv.c) | 14 | ||||
-rw-r--r-- | ui/gtk/manual_addr_resolv.h (renamed from gtk/manual_addr_resolv.h) | 0 | ||||
-rw-r--r-- | ui/gtk/mcast_stream.c (renamed from gtk/mcast_stream.c) | 6 | ||||
-rw-r--r-- | ui/gtk/mcast_stream.h (renamed from gtk/mcast_stream.h) | 0 | ||||
-rw-r--r-- | ui/gtk/mcast_stream_dlg.c (renamed from gtk/mcast_stream_dlg.c) | 14 | ||||
-rw-r--r-- | ui/gtk/mcast_stream_dlg.h (renamed from gtk/mcast_stream_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/megaco_stat.c (renamed from gtk/megaco_stat.c) | 12 | ||||
-rw-r--r-- | ui/gtk/menus.h (renamed from gtk/menus.h) | 0 | ||||
-rw-r--r-- | ui/gtk/mgcp_stat.c (renamed from gtk/mgcp_stat.c) | 12 | ||||
-rw-r--r-- | ui/gtk/mtp3_stat.c (renamed from gtk/mtp3_stat.c) | 12 | ||||
-rw-r--r-- | ui/gtk/mtp3_stat.h (renamed from gtk/mtp3_stat.h) | 0 | ||||
-rw-r--r-- | ui/gtk/mtp3_summary.c (renamed from gtk/mtp3_summary.c) | 8 | ||||
-rw-r--r-- | ui/gtk/ncp_stat.c (renamed from gtk/ncp_stat.c) | 12 | ||||
-rw-r--r-- | ui/gtk/network_icons.h (renamed from gtk/network_icons.h) | 0 | ||||
-rw-r--r-- | ui/gtk/new_packet_list.c (renamed from gtk/new_packet_list.c) | 36 | ||||
-rw-r--r-- | ui/gtk/new_packet_list.h (renamed from gtk/new_packet_list.h) | 0 | ||||
-rw-r--r-- | ui/gtk/old-gtk-compat.h (renamed from gtk/old-gtk-compat.h) | 0 | ||||
-rw-r--r-- | ui/gtk/packet_history.c (renamed from gtk/packet_history.c) | 4 | ||||
-rw-r--r-- | ui/gtk/packet_history.h (renamed from gtk/packet_history.h) | 0 | ||||
-rw-r--r-- | ui/gtk/packet_list_store.c (renamed from gtk/packet_list_store.c) | 0 | ||||
-rw-r--r-- | ui/gtk/packet_list_store.h (renamed from gtk/packet_list_store.h) | 0 | ||||
-rw-r--r-- | ui/gtk/packet_win.c (renamed from gtk/packet_win.c) | 16 | ||||
-rw-r--r-- | ui/gtk/packet_win.h (renamed from gtk/packet_win.h) | 0 | ||||
-rw-r--r-- | ui/gtk/pixmap_save.c (renamed from gtk/pixmap_save.c) | 10 | ||||
-rw-r--r-- | ui/gtk/pixmap_save.h (renamed from gtk/pixmap_save.h) | 0 | ||||
-rw-r--r-- | ui/gtk/plugins_dlg.c (renamed from gtk/plugins_dlg.c) | 6 | ||||
-rw-r--r-- | ui/gtk/plugins_dlg.h (renamed from gtk/plugins_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/prefs_capture.c (renamed from gtk/prefs_capture.c) | 18 | ||||
-rw-r--r-- | ui/gtk/prefs_capture.h (renamed from gtk/prefs_capture.h) | 0 | ||||
-rw-r--r-- | ui/gtk/prefs_column.c (renamed from gtk/prefs_column.c) | 14 | ||||
-rw-r--r-- | ui/gtk/prefs_column.h (renamed from gtk/prefs_column.h) | 0 | ||||
-rw-r--r-- | ui/gtk/prefs_dlg.c (renamed from gtk/prefs_dlg.c) | 38 | ||||
-rw-r--r-- | ui/gtk/prefs_dlg.h (renamed from gtk/prefs_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/prefs_filter_expressions.c (renamed from gtk/prefs_filter_expressions.c) | 14 | ||||
-rw-r--r-- | ui/gtk/prefs_filter_expressions.h (renamed from gtk/prefs_filter_expressions.h) | 0 | ||||
-rw-r--r-- | ui/gtk/prefs_gui.c (renamed from gtk/prefs_gui.c) | 30 | ||||
-rw-r--r-- | ui/gtk/prefs_gui.h (renamed from gtk/prefs_gui.h) | 0 | ||||
-rw-r--r-- | ui/gtk/prefs_layout.c (renamed from gtk/prefs_layout.c) | 12 | ||||
-rw-r--r-- | ui/gtk/prefs_layout.h (renamed from gtk/prefs_layout.h) | 0 | ||||
-rw-r--r-- | ui/gtk/prefs_nameres.c (renamed from gtk/prefs_nameres.c) | 12 | ||||
-rw-r--r-- | ui/gtk/prefs_nameres.h (renamed from gtk/prefs_nameres.h) | 0 | ||||
-rw-r--r-- | ui/gtk/prefs_print.c (renamed from gtk/prefs_print.c) | 16 | ||||
-rw-r--r-- | ui/gtk/prefs_print.h (renamed from gtk/prefs_print.h) | 0 | ||||
-rw-r--r-- | ui/gtk/prefs_protocols.c (renamed from gtk/prefs_protocols.c) | 4 | ||||
-rw-r--r-- | ui/gtk/prefs_protocols.h (renamed from gtk/prefs_protocols.h) | 0 | ||||
-rw-r--r-- | ui/gtk/prefs_stream.c (renamed from gtk/prefs_stream.c) | 10 | ||||
-rw-r--r-- | ui/gtk/prefs_stream.h (renamed from gtk/prefs_stream.h) | 0 | ||||
-rw-r--r-- | ui/gtk/prefs_taps.c (renamed from gtk/prefs_taps.c) | 6 | ||||
-rw-r--r-- | ui/gtk/prefs_taps.h (renamed from gtk/prefs_taps.h) | 0 | ||||
-rw-r--r-- | ui/gtk/print_dlg.c (renamed from gtk/print_dlg.c) | 20 | ||||
-rw-r--r-- | ui/gtk/profile_dlg.c (renamed from gtk/profile_dlg.c) | 18 | ||||
-rw-r--r-- | ui/gtk/profile_dlg.h (renamed from gtk/profile_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/progress_dlg.c (renamed from gtk/progress_dlg.c) | 6 | ||||
-rw-r--r-- | ui/gtk/proto_dlg.c (renamed from gtk/proto_dlg.c) | 10 | ||||
-rw-r--r-- | ui/gtk/proto_dlg.h (renamed from gtk/proto_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/proto_help.c (renamed from gtk/proto_help.c) | 4 | ||||
-rw-r--r-- | ui/gtk/proto_help.h (renamed from gtk/proto_help.h) | 0 | ||||
-rw-r--r-- | ui/gtk/proto_hier_stats_dlg.c (renamed from gtk/proto_hier_stats_dlg.c) | 14 | ||||
-rw-r--r-- | ui/gtk/proto_hier_stats_dlg.h (renamed from gtk/proto_hier_stats_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/radius_stat.c (renamed from gtk/radius_stat.c) | 12 | ||||
-rw-r--r-- | ui/gtk/range_utils.c (renamed from gtk/range_utils.c) | 6 | ||||
-rw-r--r-- | ui/gtk/range_utils.h (renamed from gtk/range_utils.h) | 0 | ||||
-rw-r--r-- | ui/gtk/recent.c (renamed from gtk/recent.c) | 16 | ||||
-rw-r--r-- | ui/gtk/recent.h (renamed from gtk/recent.h) | 0 | ||||
-rw-r--r-- | ui/gtk/remote_icons.h (renamed from gtk/remote_icons.h) | 0 | ||||
-rw-r--r-- | ui/gtk/rlc_lte_stat_dlg.c (renamed from gtk/rlc_lte_stat_dlg.c) | 16 | ||||
-rw-r--r-- | ui/gtk/rpc_progs.c (renamed from gtk/rpc_progs.c) | 10 | ||||
-rw-r--r-- | ui/gtk/rpc_stat.c (renamed from gtk/rpc_stat.c) | 22 | ||||
-rw-r--r-- | ui/gtk/rtp_analysis.c (renamed from gtk/rtp_analysis.c) | 32 | ||||
-rw-r--r-- | ui/gtk/rtp_analysis.h (renamed from gtk/rtp_analysis.h) | 0 | ||||
-rw-r--r-- | ui/gtk/rtp_player.c (renamed from gtk/rtp_player.c) | 20 | ||||
-rw-r--r-- | ui/gtk/rtp_player.h (renamed from gtk/rtp_player.h) | 0 | ||||
-rw-r--r-- | ui/gtk/rtp_stream.c (renamed from gtk/rtp_stream.c) | 6 | ||||
-rw-r--r-- | ui/gtk/rtp_stream.h (renamed from gtk/rtp_stream.h) | 0 | ||||
-rw-r--r-- | ui/gtk/rtp_stream_dlg.c (renamed from gtk/rtp_stream_dlg.c) | 18 | ||||
-rw-r--r-- | ui/gtk/rtp_stream_dlg.h (renamed from gtk/rtp_stream_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/sat.h (renamed from gtk/sat.h) | 0 | ||||
-rw-r--r-- | ui/gtk/scsi_stat.c (renamed from gtk/scsi_stat.c) | 18 | ||||
-rw-r--r-- | ui/gtk/sctp_assoc_analyse.c (renamed from gtk/sctp_assoc_analyse.c) | 12 | ||||
-rw-r--r-- | ui/gtk/sctp_byte_graph_dlg.c (renamed from gtk/sctp_byte_graph_dlg.c) | 8 | ||||
-rw-r--r-- | ui/gtk/sctp_chunk_stat.c (renamed from gtk/sctp_chunk_stat.c) | 12 | ||||
-rw-r--r-- | ui/gtk/sctp_chunk_stat_dlg.c (renamed from gtk/sctp_chunk_stat_dlg.c) | 8 | ||||
-rw-r--r-- | ui/gtk/sctp_error_dlg.c (renamed from gtk/sctp_error_dlg.c) | 8 | ||||
-rw-r--r-- | ui/gtk/sctp_graph_dlg.c (renamed from gtk/sctp_graph_dlg.c) | 8 | ||||
-rw-r--r-- | ui/gtk/sctp_stat.c (renamed from gtk/sctp_stat.c) | 6 | ||||
-rw-r--r-- | ui/gtk/sctp_stat.h (renamed from gtk/sctp_stat.h) | 0 | ||||
-rw-r--r-- | ui/gtk/sctp_stat_dlg.c (renamed from gtk/sctp_stat_dlg.c) | 16 | ||||
-rw-r--r-- | ui/gtk/service_response_time_table.c (renamed from gtk/service_response_time_table.c) | 8 | ||||
-rw-r--r-- | ui/gtk/service_response_time_table.h (renamed from gtk/service_response_time_table.h) | 0 | ||||
-rw-r--r-- | ui/gtk/simple_dialog.c (renamed from gtk/simple_dialog.c) | 10 | ||||
-rw-r--r-- | ui/gtk/sip_stat.c (renamed from gtk/sip_stat.c) | 10 | ||||
-rw-r--r-- | ui/gtk/smb2_stat.c (renamed from gtk/smb2_stat.c) | 16 | ||||
-rw-r--r-- | ui/gtk/smb_stat.c (renamed from gtk/smb_stat.c) | 16 | ||||
-rw-r--r-- | ui/gtk/stats_tree_stat.c (renamed from gtk/stats_tree_stat.c) | 10 | ||||
-rw-r--r-- | ui/gtk/stock_icons.c (renamed from gtk/stock_icons.c) | 2 | ||||
-rw-r--r-- | ui/gtk/stock_icons.h (renamed from gtk/stock_icons.h) | 0 | ||||
-rw-r--r-- | ui/gtk/summary_dlg.c (renamed from gtk/summary_dlg.c) | 12 | ||||
-rw-r--r-- | ui/gtk/summary_dlg.h (renamed from gtk/summary_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/supported_protos_dlg.c (renamed from gtk/supported_protos_dlg.c) | 10 | ||||
-rw-r--r-- | ui/gtk/supported_protos_dlg.h (renamed from gtk/supported_protos_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/tap_param_dlg.c (renamed from gtk/tap_param_dlg.c) | 20 | ||||
-rw-r--r-- | ui/gtk/tap_param_dlg.h (renamed from gtk/tap_param_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/tcp_graph.c (renamed from gtk/tcp_graph.c) | 8 | ||||
-rw-r--r-- | ui/gtk/text_import.c (renamed from gtk/text_import.c) | 0 | ||||
-rw-r--r-- | ui/gtk/text_import.h (renamed from gtk/text_import.h) | 0 | ||||
-rw-r--r-- | ui/gtk/text_import_scanner.h (renamed from gtk/text_import_scanner.h) | 0 | ||||
-rw-r--r-- | ui/gtk/text_import_scanner.l (renamed from gtk/text_import_scanner.l) | 0 | ||||
-rw-r--r-- | ui/gtk/text_page_utils.c (renamed from gtk/text_page_utils.c) | 6 | ||||
-rw-r--r-- | ui/gtk/text_page_utils.h (renamed from gtk/text_page_utils.h) | 0 | ||||
-rw-r--r-- | ui/gtk/time_shift_dlg.c (renamed from gtk/time_shift_dlg.c) | 14 | ||||
-rw-r--r-- | ui/gtk/time_shift_dlg.h (renamed from gtk/time_shift_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/uat_gui.c (renamed from gtk/uat_gui.c) | 18 | ||||
-rw-r--r-- | ui/gtk/uat_gui.h (renamed from gtk/uat_gui.h) | 0 | ||||
-rw-r--r-- | ui/gtk/ui/main-menubar-ui.xml (renamed from gtk/ui/main-menubar-ui.xml) | 0 | ||||
-rw-r--r-- | ui/gtk/utf8_entities.h (renamed from gtk/utf8_entities.h) | 0 | ||||
-rw-r--r-- | ui/gtk/voip_calls.c (renamed from gtk/voip_calls.c) | 10 | ||||
-rw-r--r-- | ui/gtk/voip_calls.h (renamed from gtk/voip_calls.h) | 0 | ||||
-rw-r--r-- | ui/gtk/voip_calls_dlg.c (renamed from gtk/voip_calls_dlg.c) | 24 | ||||
-rw-r--r-- | ui/gtk/voip_calls_dlg.h (renamed from gtk/voip_calls_dlg.h) | 0 | ||||
-rw-r--r-- | ui/gtk/webbrowser.c (renamed from gtk/webbrowser.c) | 2 | ||||
-rw-r--r-- | ui/gtk/webbrowser.h (renamed from gtk/webbrowser.h) | 0 | ||||
-rw-r--r-- | ui/gtk/wlan_stat_dlg.c (renamed from gtk/wlan_stat_dlg.c) | 22 | ||||
-rw-r--r-- | ui/gtk/wsp_stat.c (renamed from gtk/wsp_stat.c) | 10 | ||||
-rw-r--r-- | ui/qt/QtShark.pro | 10 | ||||
-rw-r--r-- | ui/qt/capture_interface_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/display_filter_combo.cpp | 2 | ||||
-rw-r--r-- | ui/qt/display_filter_edit.cpp | 2 | ||||
-rw-r--r-- | ui/qt/interface_tree.cpp | 2 | ||||
-rw-r--r-- | ui/qt/main.cpp | 6 | ||||
-rw-r--r-- | ui/qt/main_window.cpp | 2 | ||||
-rw-r--r-- | ui/qt/packet_list.cpp | 4 | ||||
-rw-r--r-- | ui/qt/qt_ui_utils.cpp | 4 | ||||
-rw-r--r-- | ui/qt/qt_ui_utils.h | 2 | ||||
-rw-r--r-- | ui/qt/wireshark_application.cpp | 2 | ||||
-rw-r--r-- | win32/file_dlg_win32.c | 18 |
322 files changed, 1279 insertions, 1271 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c77d4eb9a8..fbab9e5743 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -422,7 +422,7 @@ add_subdirectory( wiretap ) add_subdirectory( wsutil ) if(BUILD_wireshark AND GTK_FOUND) - add_subdirectory( gtk ) + add_subdirectory( ui/gtk ) endif() # Basedir where to install guides @@ -470,7 +470,7 @@ PRINT_ENABLED_FEATURES() PRINT_DISABLED_FEATURES() link_directories( - ${CMAKE_BINARY_DIR}/gtk + ${CMAKE_BINARY_DIR}/ui/gtk ${CMAKE_BINARY_DIR}/codecs ${CMAKE_BINARY_DIR}/epan ${CMAKE_BINARY_DIR}/wiretap diff --git a/Makefile.am b/Makefile.am index cd75fc964c..4da0e668ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -264,7 +264,7 @@ tpncp_DATA = \ # uidir = $(pkgdatadir)/ui ui_DATA = \ - gtk/ui/main-menubar-ui.xml + ui/gtk/ui/main-menubar-ui.xml # # Install the wimaxasncp directory files in the "wimaxasncp" subdirectory @@ -323,13 +323,13 @@ endif # @GTK_LIBS@ (as those are also needed for X applications, and GTK+ # applications are X applications). wireshark_LDADD = \ - gtk/libui.a \ - gtk/libui_dirty.a \ + ui/gtk/libui.a \ + ui/gtk/libui_dirty.a \ codecs/libcodec.a \ wiretap/libwiretap.la \ epan/libwireshark.la \ wsutil/libwsutil.la \ - @SSL_LIBS@ \ + @SSL_LIBS@ \ $(plugin_ldadd) \ @PCAP_LIBS@ \ @GTK_LIBS@ -lm \ @@ -582,8 +582,8 @@ EXTRA_DIST = \ capture-wpcap.h \ capture_wpcap_packet.c \ capture_wpcap_packet.h \ - cfilters \ - colorfilters \ + cfilters \ + colorfilters \ config.h.win32 \ config.nmake \ debian/changelog \ @@ -616,7 +616,7 @@ EXTRA_DIST = \ debian/wireshark.manpages \ debian/wireshark.menu \ epan/dfilter/README.dfilter \ - dfilters \ + dfilters \ doxygen.cfg.in \ dumpcap.c \ editcap.c \ @@ -891,7 +891,7 @@ endif endif -DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil docbook +DIST_SUBDIRS = asn1 codecs doc epan ui/gtk help packaging plugins tools wiretap wsutil docbook if HAVE_PLUGINS SUBDIRS = tools wsutil wiretap epan plugins packaging help @wireshark_SUBDIRS@ . doc diff --git a/Makefile.nmake b/Makefile.nmake index 9ab5d339d5..bde86a74f6 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -235,7 +235,7 @@ packaging_zip: all rm -f wireshark.zip zip -r -9 wireshark.zip $(INSTALL_DIR)/ -wireshark.bsc: *.sbr epan\*.sbr epan\dfilter\*.sbr epan\ftypes\*.sbr epan\wslua\*.sbr epan\dissectors\*.sbr gtk\*.sbr win32\*.sbr wiretap\*.sbr +wireshark.bsc: *.sbr epan\*.sbr epan\dfilter\*.sbr epan\ftypes\*.sbr epan\wslua\*.sbr epan\dissectors\*.sbr ui\gtk\*.sbr win32\*.sbr wiretap\*.sbr rm -f $@ $(BSCMAKE) @<< /o $@ $? @@ -252,10 +252,10 @@ $(RESOURCES): image wiretap\wiretap-$(WTAP_VERSION).lib: image $(ZLIB_DLL) wiretap -wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) codecs epan gtk win32 image\wireshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib gtk\libui.lib win32\libui_win32.lib plugins +wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) codecs epan ui\gtk win32 image\wireshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib ui\gtk\libui.lib win32\libui_win32.lib plugins @echo Linking $@ $(LINK) @<< - /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK_LIBS) codecs\codecs.lib gtk\libui.lib win32\libui_win32.lib $(wireshark_OBJECTS) image\wireshark.res + /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK_LIBS) codecs\codecs.lib ui\gtk\libui.lib win32\libui_win32.lib $(wireshark_OBJECTS) image\wireshark.res << !IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "wireshark.exe.manifest" -outputresource:wireshark.exe;1 @@ -463,9 +463,9 @@ clean: clean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../codecs $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../gtk + cd ../ui/gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../win32 + cd ../../win32 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../epan $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean @@ -509,9 +509,9 @@ distclean: distclean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../codecs $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../gtk + cd ../ui/gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../win32 + cd ../../win32 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../epan $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean @@ -550,7 +550,7 @@ maintainer-clean: maintainer-clean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../win32 + cd ../../win32 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../epan $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean @@ -649,14 +649,14 @@ wiretap:: cd .. codecs:: - cd codecs - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. + cd codecs + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake + cd .. gtk:: help config.h svnversion.h doxygen - cd gtk + cd ui/gtk $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libui.lib - cd .. + cd ../.. win32:: cd win32 @@ -780,7 +780,7 @@ setup: verify_tools clean_setup process_libs # The process_libs target when invoked causes either a --libverify or a --download for all the required libraries. # (The choice is determined by the value of the macro WIN_SETUP_OPT). process_libs: - @if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)" + @if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)" !IFDEF GTK_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ gtk2 gtk+-bundle_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip @@ -1007,7 +1007,7 @@ install-generated-files: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-plugins cd .. if not exist $(INSTALL_DIR)\ui mkdir $(INSTALL_DIR)\ui - xcopy "gtk\ui\*.xml" $(INSTALL_DIR)\ui /d + xcopy "ui\gtk\ui\*.xml" $(INSTALL_DIR)\ui /d # "install-all" will copy all files needed to run Wireshark/Tshark # to the INSTALL_DIR, so you can run/debug Wireshark/Tshark from there. @@ -1123,9 +1123,9 @@ checkapi: checkapi_local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi cd ../codecs $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../gtk + cd ../ui/gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../win32 + cd ../../win32 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi cd ../epan ## $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi diff --git a/configure.in b/configure.in index 225c788311..a9c135ddf3 100644 --- a/configure.in +++ b/configure.in @@ -856,7 +856,7 @@ else # wireshark_bin="wireshark\$(EXEEXT)" wireshark_man="wireshark.1" - wireshark_SUBDIRS="codecs gtk" + wireshark_SUBDIRS="codecs ui/gtk" # Don't use GLIB_CFLAGS AM_PATH_GLIB_2_0(2.14.0, , AC_MSG_ERROR(GLib 2.14 or later distribution not found.), gthread gmodule) @@ -1977,8 +1977,8 @@ AC_OUTPUT( epan/wslua/Makefile epan/wspython/Makefile codecs/Makefile - gtk/Makefile - gtk/doxygen.cfg + ui/gtk/Makefile + ui/gtk/doxygen.cfg help/Makefile packaging/Makefile packaging/macosx/Info.plist diff --git a/epan/plugins.c b/epan/plugins.c index 4e94a73fcc..2e8e863fa2 100644 --- a/epan/plugins.c +++ b/epan/plugins.c @@ -510,7 +510,7 @@ register_all_codecs(void) #endif /* big HAVE_PLUGINS */ /* - * Dump plugin info to stdout. Copied from gtk/plugins_dlg.c:plugins_scan. + * Dump plugin info to stdout. Copied from ui/gtk/plugins_dlg.c:plugins_scan. */ void plugins_dump_all(void) diff --git a/epan/timestamp.c b/epan/timestamp.c index 494e6df863..35a4e25ca4 100644 --- a/epan/timestamp.c +++ b/epan/timestamp.c @@ -28,7 +28,7 @@ #include "timestamp.h" -/* Init with an invalid value, so that "recent" in gtk/menu.c can detect this +/* Init with an invalid value, so that "recent" in ui/gtk/menu.c can detect this * and distinguish it from a command line value */ static ts_type timestamp_type = TS_NOT_SET; @@ -3481,7 +3481,7 @@ cf_select_packet(capture_file *cf, int row) if (fdata == NULL) { /* XXX - if a GtkCList's selection mode is GTK_SELECTION_BROWSE, when the first entry is added to it by "real_insert_row()", that row - is selected (see "real_insert_row()", in "gtk/gtkclist.c", in both + is selected (see "real_insert_row()", in "ui/gtk/gtkclist.c", in both our version and the vanilla GTK+ version). This means that a "select-row" signal is emitted; this causes diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 82f484a1c2..2e9b3af4c8 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -669,7 +669,7 @@ File "..\..\tpncp\tpncp.dat" ; of the installation directory. ; SetOutPath $INSTDIR\ui -File "..\..\gtk\ui\main-menubar-ui.xml" +File "..\..\ui\gtk\ui\main-menubar-ui.xml" SetOutPath $INSTDIR ; diff --git a/tap-megaco-common.h b/tap-megaco-common.h index 6bbf16a3a6..0a73ddc006 100644 --- a/tap-megaco-common.h +++ b/tap-megaco-common.h @@ -6,7 +6,7 @@ * Copyright 2008, Ericsson AB * By Balint Reczey <balint.reczey@ericsson.com> * - * most functions are copied from gtk/rtp_stream.c and gtk/rtp_analysis.c + * most functions are copied from ui/gtk/rtp_stream.c and ui/gtk/rtp_analysis.c * Copyright 2003, Alcatel Business Systems * By Lars Ruoff <lars.ruoff@gmx.net> * @@ -44,7 +44,7 @@ case GCP_CMD_NOTIFY_REPLY: \ case GCP_CMD_SVCCHG_REPLY: \ case GCP_CMD_TOPOLOGY_REPLY: \ - case GCP_CMD_REPLY: + case GCP_CMD_REPLY: #define GCP_CMD_REQ_CASE \ case GCP_CMD_ADD_REQ: \ diff --git a/tap-rtp-common.c b/tap-rtp-common.c index 8efbc06ef9..206fd61db0 100644 --- a/tap-rtp-common.c +++ b/tap-rtp-common.c @@ -6,7 +6,7 @@ * Copyright 2008, Ericsson AB * By Balint Reczey <balint.reczey@ericsson.com> * - * most functions are copied from gtk/rtp_stream.c and gtk/rtp_analisys.c + * most functions are copied from ui/gtk/rtp_stream.c and ui/gtk/rtp_analisys.c * Copyright 2003, Alcatel Business Systems * By Lars Ruoff <lars.ruoff@gmx.net> * @@ -42,7 +42,7 @@ #include <epan/rtp_pt.h> #include <epan/addr_resolv.h> #include <epan/dissectors/packet-rtp.h> -#include "gtk/rtp_stream.h" +#include "ui/gtk/rtp_stream.h" #include "tap-rtp-common.h" /* XXX: are changes needed to properly handle situations where diff --git a/tap-rtp-common.h b/tap-rtp-common.h index 3ad22e2689..8c040180a8 100644 --- a/tap-rtp-common.h +++ b/tap-rtp-common.h @@ -6,7 +6,7 @@ * Copyright 2008, Ericsson AB * By Balint Reczey <balint.reczey@ericsson.com> * - * most functions are copied from gtk/rtp_stream.c and gtk/rtp_analisys.c + * most functions are copied from ui/gtk/rtp_stream.c and ui/gtk/rtp_analisys.c * Copyright 2003, Alcatel Business Systems * By Lars Ruoff <lars.ruoff@gmx.net> * @@ -32,7 +32,7 @@ #ifndef TAP_RTP_COMMON_H_INCLUDED #define TAP_RTP_COMMON_H_INCLUDED -#include "gtk/rtp_stream.h" +#include "ui/gtk/rtp_stream.h" gint rtp_stream_info_cmp(gconstpointer, gconstpointer); void rtpstream_reset_cb(void*); @@ -6,7 +6,7 @@ * Copyright 2008, Ericsson AB * By Balint Reczey <balint.reczey@ericsson.com> * - * based on gtk/rtp_stream_dlg.c + * based on ui/gtk/rtp_stream_dlg.c * Copyright 2003, Alcatel Business Systems * By Lars Ruoff <lars.ruoff@gmx.net> * diff --git a/tap-sipstat.c b/tap-sipstat.c index 5d545b66f1..b8273219ba 100644 --- a/tap-sipstat.c +++ b/tap-sipstat.c @@ -2,7 +2,7 @@ * sip message counter for wireshark * * $Id$ - * Copied from gtk/sip_stat.c and tap-httpstat.c + * Copied from ui/gtk/sip_stat.c and tap-httpstat.c * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -42,7 +42,7 @@ /* used to keep track of the statictics for an entire program interface */ typedef struct _sip_stats_t { - char *filter; + char *filter; guint32 packets; /* number of sip packets, including continuations */ guint32 resent_packets; guint32 average_setup_time; @@ -58,8 +58,8 @@ typedef struct _sip_stats_t { * for example it can be { 3, 404, "Not Found" ,...} * which means we captured 3 reply sip/1.1 404 Not Found */ typedef struct _sip_response_code_t { - guint32 packets; /* 3 */ - guint response_code; /* 404 */ + guint32 packets; /* 3 */ + guint response_code; /* 404 */ const gchar *name; /* Not Found */ sipstat_t *sp; } sip_response_code_t; @@ -151,7 +151,7 @@ static const value_string vals_status_code[] = { { 606, "Not Acceptable"}, { 699, "Global Failure - Others"}, - { 0, NULL} + { 0, NULL} }; /* Create tables for responses and requests */ diff --git a/gtk/CMakeLists.txt b/ui/gtk/CMakeLists.txt index 69df1c121a..69df1c121a 100644 --- a/gtk/CMakeLists.txt +++ b/ui/gtk/CMakeLists.txt diff --git a/gtk/Makefile.am b/ui/gtk/Makefile.am index be3a0e5276..be3a0e5276 100644 --- a/gtk/Makefile.am +++ b/ui/gtk/Makefile.am diff --git a/gtk/Makefile.common b/ui/gtk/Makefile.common index af92171155..af92171155 100644 --- a/gtk/Makefile.common +++ b/ui/gtk/Makefile.common diff --git a/gtk/Makefile.nmake b/ui/gtk/Makefile.nmake index b8639f87e0..b8639f87e0 100644 --- a/gtk/Makefile.nmake +++ b/ui/gtk/Makefile.nmake diff --git a/gtk/Makefile_custom.common b/ui/gtk/Makefile_custom.common index 539b3f3b8f..539b3f3b8f 100644 --- a/gtk/Makefile_custom.common +++ b/ui/gtk/Makefile_custom.common diff --git a/gtk/STATUS.gtk3 b/ui/gtk/STATUS.gtk3 index 88af5daf7c..58999d87ed 100644 --- a/gtk/STATUS.gtk3 +++ b/ui/gtk/STATUS.gtk3 @@ -17,6 +17,8 @@ To build Wireshark with GTK3 instead of GTK2, use: http://lists-archives.org/gtk-devel/13233-fwd-precompiled-gtk3-for-windows.html A Win32 port is in the making (and availalbe as source): http://blogs.gnome.org/alexl/2011/11/25/gtk-work-on-windows/ + The location of an experimental build can be found at: + http://www.pguridi.com.ar/2011/10/experimental-gtk-3-3-2-win32-build/ Except in one place we are building on GTK2 using the compat flags -DGTK_DISABLE_SINGLE_INCLUDES diff --git a/gtk/about_dlg.c b/ui/gtk/about_dlg.c index 682ed8f032..d0e0f228be 100644 --- a/gtk/about_dlg.c +++ b/ui/gtk/about_dlg.c @@ -43,14 +43,14 @@ #include "../log.h" #include "../version_info.h" -#include "gtk/about_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/file_dlg.h" -#include "gtk/text_page_utils.h" -#include "gtk/gtkglobals.h" -#include "gtk/main.h" -#include "gtk/plugins_dlg.h" +#include "ui/gtk/about_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/text_page_utils.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/main.h" +#include "ui/gtk/plugins_dlg.h" #include "../image/wssplash-dev.xpm" #include "webbrowser.h" diff --git a/gtk/about_dlg.h b/ui/gtk/about_dlg.h index b36d7bf0b0..b36d7bf0b0 100644 --- a/gtk/about_dlg.h +++ b/ui/gtk/about_dlg.h diff --git a/gtk/afp_stat.c b/ui/gtk/afp_stat.c index ec727cd24b..f0da6e1d6e 100644 --- a/gtk/afp_stat.c +++ b/ui/gtk/afp_stat.c @@ -46,13 +46,13 @@ #include "../file.h" #include "../stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/service_response_time_table.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/main.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/service_response_time_table.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/main.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" /* used to keep track of the statistics for an entire program interface */ typedef struct _afpstat_t { diff --git a/gtk/airpcap_dlg.c b/ui/gtk/airpcap_dlg.c index 16bda59517..0ab3d717fb 100644 --- a/gtk/airpcap_dlg.c +++ b/ui/gtk/airpcap_dlg.c @@ -46,15 +46,15 @@ #include "../simple_dialog.h" -#include "gtk/main.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/dfilter_expr_dlg.h" -#include "gtk/stock_icons.h" -#include "gtk/gtkglobals.h" -#include "gtk/help_dlg.h" -#include "gtk/keys.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/main.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dfilter_expr_dlg.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/old-gtk-compat.h" #include <airpcap.h> #include "airpcap_loader.h" diff --git a/gtk/airpcap_dlg.h b/ui/gtk/airpcap_dlg.h index 4ca9fb7d24..4ca9fb7d24 100644 --- a/gtk/airpcap_dlg.h +++ b/ui/gtk/airpcap_dlg.h diff --git a/gtk/airpcap_gui_utils.c b/ui/gtk/airpcap_gui_utils.c index 1887adf170..9e2902fb8d 100644 --- a/gtk/airpcap_gui_utils.c +++ b/ui/gtk/airpcap_gui_utils.c @@ -43,13 +43,13 @@ #include "../simple_dialog.h" -#include "gtk/main.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/dfilter_expr_dlg.h" -#include "gtk/help_dlg.h" -#include "gtk/keys.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/main.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dfilter_expr_dlg.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/old-gtk-compat.h" #include <airpcap.h> #include "airpcap_loader.h" diff --git a/gtk/airpcap_gui_utils.h b/ui/gtk/airpcap_gui_utils.h index fb84a25d66..fb84a25d66 100644 --- a/gtk/airpcap_gui_utils.h +++ b/ui/gtk/airpcap_gui_utils.h diff --git a/gtk/ansi_a_stat.c b/ui/gtk/ansi_a_stat.c index 40fa4bd5b9..8b1eccd9e8 100644 --- a/gtk/ansi_a_stat.c +++ b/ui/gtk/ansi_a_stat.c @@ -48,12 +48,12 @@ #include "../stat_menu.h" #include "../simple_dialog.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/filter_dlg.h" -#include "gtk/gui_utils.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/gui_utils.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" enum { diff --git a/gtk/ansi_map_stat.c b/ui/gtk/ansi_map_stat.c index 14511c80eb..893707bcbc 100644 --- a/gtk/ansi_map_stat.c +++ b/ui/gtk/ansi_map_stat.c @@ -47,12 +47,12 @@ #include "../stat_menu.h" #include "../simple_dialog.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/filter_dlg.h" -#include "gtk/gui_utils.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/gui_utils.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" enum { diff --git a/gtk/bootp_stat.c b/ui/gtk/bootp_stat.c index db8af36397..5b4e9f7c6a 100644 --- a/gtk/bootp_stat.c +++ b/ui/gtk/bootp_stat.c @@ -37,12 +37,12 @@ #include "../simple_dialog.h" #include "../stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/main.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/main.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" typedef const char* bootp_info_value_t; diff --git a/gtk/camel_counter.c b/ui/gtk/camel_counter.c index f8f8ba2a18..66c3dd4d95 100644 --- a/gtk/camel_counter.c +++ b/ui/gtk/camel_counter.c @@ -46,13 +46,13 @@ #include "../timestats.h" #include "../simple_dialog.h" -#include "gtk/main.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/gui_stat_util.h" -#include "gtk/tap_param_dlg.h" +#include "ui/gtk/main.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/gui_stat_util.h" +#include "ui/gtk/tap_param_dlg.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" static void gtk_camelcounter_reset(void *phs); static int gtk_camelcounter_packet(void *phs, diff --git a/gtk/camel_srt.c b/ui/gtk/camel_srt.c index d2cd3637d7..6b0546e728 100644 --- a/gtk/camel_srt.c +++ b/ui/gtk/camel_srt.c @@ -47,14 +47,14 @@ #include "../file.h" #include "../stat_menu.h" -#include "gtk/main.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/gui_stat_util.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/service_response_time_table.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/main.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/gui_stat_util.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/service_response_time_table.h" + +#include "ui/gtk/old-gtk-compat.h" /* used to keep track of the statistics for an entire program interface */ struct camelsrt_t { diff --git a/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c index 26d98c39f0..9e3b1dd174 100644 --- a/gtk/capture_dlg.c +++ b/ui/gtk/capture_dlg.c @@ -50,26 +50,26 @@ #include "../capture_ui_utils.h" #include "../ringbuffer.h" -#include "gtk/main.h" -#include "gtk/menus.h" -#include "gtk/gui_utils.h" -#include "gtk/capture_dlg.h" -#include "gtk/filter_dlg.h" -#include "gtk/dlg_utils.h" -#include "gtk/file_dlg.h" -#include "gtk/stock_icons.h" -#include "gtk/capture_file_dlg.h" -#include "gtk/help_dlg.h" -#include "gtk/gtkglobals.h" -#include "gtk/capture_globals.h" -#include "gtk/cfilter_combo_utils.h" -#include "gtk/capture_if_dlg.h" -#include "gtk/main_welcome.h" -#include "gtk/network_icons.h" - -#include "gtk/keys.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/main.h" +#include "ui/gtk/menus.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/capture_dlg.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/capture_file_dlg.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/capture_globals.h" +#include "ui/gtk/cfilter_combo_utils.h" +#include "ui/gtk/capture_if_dlg.h" +#include "ui/gtk/main_welcome.h" +#include "ui/gtk/network_icons.h" + +#include "ui/gtk/keys.h" + +#include "ui/gtk/old-gtk-compat.h" #ifdef HAVE_AIRPCAP #include <airpcap.h> diff --git a/gtk/capture_dlg.h b/ui/gtk/capture_dlg.h index c782596504..c782596504 100644 --- a/gtk/capture_dlg.h +++ b/ui/gtk/capture_dlg.h diff --git a/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c index 45f08bd6cf..4a2a6c1ed7 100644 --- a/gtk/capture_file_dlg.c +++ b/ui/gtk/capture_file_dlg.c @@ -49,25 +49,25 @@ #include "../util.h" #include <wsutil/file_util.h> -#include "gtk/gtkglobals.h" -#include "gtk/keys.h" -#include "gtk/filter_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/file_dlg.h" -#include "gtk/capture_file_dlg.h" -#include "gtk/drag_and_drop.h" -#include "gtk/main.h" -#include "gtk/menus.h" -#include "gtk/recent.h" -#include "gtk/color_dlg.h" -#include "gtk/new_packet_list.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/capture_file_dlg.h" +#include "ui/gtk/drag_and_drop.h" +#include "ui/gtk/main.h" +#include "ui/gtk/menus.h" +#include "ui/gtk/recent.h" +#include "ui/gtk/color_dlg.h" +#include "ui/gtk/new_packet_list.h" #ifdef HAVE_LIBPCAP -#include "gtk/capture_dlg.h" +#include "ui/gtk/capture_dlg.h" #endif -#include "gtk/stock_icons.h" -#include "gtk/range_utils.h" -#include "gtk/filter_autocomplete.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/range_utils.h" +#include "ui/gtk/filter_autocomplete.h" #if _WIN32 #include <gdk/gdkwin32.h> diff --git a/gtk/capture_file_dlg.h b/ui/gtk/capture_file_dlg.h index 0353e08b7c..0353e08b7c 100644 --- a/gtk/capture_file_dlg.h +++ b/ui/gtk/capture_file_dlg.h diff --git a/gtk/capture_globals.h b/ui/gtk/capture_globals.h index 9482557079..9482557079 100644 --- a/gtk/capture_globals.h +++ b/ui/gtk/capture_globals.h diff --git a/gtk/capture_if_details_dlg_win32.c b/ui/gtk/capture_if_details_dlg_win32.c index f66e80de61..c941d121a2 100644 --- a/gtk/capture_if_details_dlg_win32.c +++ b/ui/gtk/capture_if_details_dlg_win32.c @@ -41,11 +41,11 @@ #include "../capture.h" #include "../simple_dialog.h" -#include "gtk/main.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/help_dlg.h" -#include "gtk/capture_if_details_dlg_win32.h" +#include "ui/gtk/main.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/capture_if_details_dlg_win32.h" #include <winsock2.h> /* Needed here to force a definition of WINVER */ /* for some (all ?) Microsoft compilers newer than vc6. */ diff --git a/gtk/capture_if_details_dlg_win32.h b/ui/gtk/capture_if_details_dlg_win32.h index 0873e1bd34..0873e1bd34 100644 --- a/gtk/capture_if_details_dlg_win32.h +++ b/ui/gtk/capture_if_details_dlg_win32.h diff --git a/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c index 02cd06a463..958e8cbae5 100644 --- a/gtk/capture_if_dlg.c +++ b/ui/gtk/capture_if_dlg.c @@ -48,33 +48,33 @@ #include <wiretap/wtap.h> #ifdef _WIN32 -#include "gtk/capture_if_details_dlg_win32.h" +#include "ui/gtk/capture_if_details_dlg_win32.h" #endif -#include "gtk/stock_icons.h" -#include "gtk/capture_dlg.h" -#include "gtk/capture_if_dlg.h" -#include "gtk/recent.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/main.h" -#include "gtk/main_toolbar.h" -#include "gtk/help_dlg.h" -#include "gtk/keys.h" -#include "gtk/webbrowser.h" -#include "gtk/capture_globals.h" -#include "gtk/network_icons.h" -#include "gtk/main_welcome.h" -#include "gtk/menus.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/capture_dlg.h" +#include "ui/gtk/capture_if_dlg.h" +#include "ui/gtk/recent.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/main_toolbar.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/webbrowser.h" +#include "ui/gtk/capture_globals.h" +#include "ui/gtk/network_icons.h" +#include "ui/gtk/main_welcome.h" +#include "ui/gtk/menus.h" + +#include "ui/gtk/old-gtk-compat.h" #ifdef HAVE_AIRPCAP #include "../image/toolbar/capture_airpcap_16.xpm" #endif #if defined(HAVE_PCAP_REMOTE) -#include "gtk/remote_icons.h" +#include "ui/gtk/remote_icons.h" #endif #ifdef _WIN32 diff --git a/gtk/capture_if_dlg.h b/ui/gtk/capture_if_dlg.h index 3c2f2359d0..3c2f2359d0 100644 --- a/gtk/capture_if_dlg.h +++ b/ui/gtk/capture_if_dlg.h diff --git a/gtk/capture_info_dlg.c b/ui/gtk/capture_info_dlg.c index 6a209fe4f2..d99724fc51 100644 --- a/gtk/capture_info_dlg.c +++ b/ui/gtk/capture_info_dlg.c @@ -44,11 +44,11 @@ #include "../capture_ui_utils.h" #include "../capture-pcap-util.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/main.h" -#include "gtk/help_dlg.h" -#include "gtk/stock_icons.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/stock_icons.h" #ifdef HAVE_AIRPCAP #include <airpcap.h> diff --git a/gtk/cfilter_combo_utils.c b/ui/gtk/cfilter_combo_utils.c index e7fc5ca3ff..67cfcff6bf 100644 --- a/gtk/cfilter_combo_utils.c +++ b/ui/gtk/cfilter_combo_utils.c @@ -31,10 +31,10 @@ #include <gtk/gtk.h> -#include "gtk/main.h" -#include "gtk/gtkglobals.h" -#include "gtk/cfilter_combo_utils.h" -#include "gtk/recent.h" +#include "ui/gtk/main.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/cfilter_combo_utils.h" +#include "ui/gtk/recent.h" /* XXX: use a preference for this setting! */ diff --git a/gtk/cfilter_combo_utils.h b/ui/gtk/cfilter_combo_utils.h index f07f770222..f07f770222 100644 --- a/gtk/cfilter_combo_utils.h +++ b/ui/gtk/cfilter_combo_utils.h diff --git a/gtk/color_dlg.c b/ui/gtk/color_dlg.c index 91135bc108..0f3ee92558 100644 --- a/gtk/color_dlg.c +++ b/ui/gtk/color_dlg.c @@ -39,19 +39,19 @@ #include "../file.h" #include "../simple_dialog.h" -#include "gtk/main.h" -#include "gtk/color_utils.h" -#include "gtk/color_dlg.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/dfilter_expr_dlg.h" -#include "gtk/stock_icons.h" -#include "gtk/filter_dlg.h" -#include "gtk/capture_file_dlg.h" -#include "gtk/gtkglobals.h" -#include "gtk/help_dlg.h" -#include "gtk/color_edit_dlg.h" -#include "gtk/new_packet_list.h" +#include "ui/gtk/main.h" +#include "ui/gtk/color_utils.h" +#include "ui/gtk/color_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dfilter_expr_dlg.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/capture_file_dlg.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/color_edit_dlg.h" +#include "ui/gtk/new_packet_list.h" #define BUTTON_SIZE_X -1 diff --git a/gtk/color_dlg.h b/ui/gtk/color_dlg.h index 4d98157ff0..4d98157ff0 100644 --- a/gtk/color_dlg.h +++ b/ui/gtk/color_dlg.h diff --git a/gtk/color_edit_dlg.c b/ui/gtk/color_edit_dlg.c index 2e47bcb46d..77cb2fa23e 100644 --- a/gtk/color_edit_dlg.c +++ b/ui/gtk/color_edit_dlg.c @@ -36,17 +36,17 @@ #include "../color_filters.h" #include "../simple_dialog.h" -#include "gtk/color_dlg.h" -#include "gtk/color_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/stock_icons.h" -#include "gtk/filter_dlg.h" -#include "gtk/dfilter_expr_dlg.h" -#include "gtk/color_edit_dlg.h" -#include "gtk/filter_autocomplete.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/color_dlg.h" +#include "ui/gtk/color_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/dfilter_expr_dlg.h" +#include "ui/gtk/color_edit_dlg.h" +#include "ui/gtk/filter_autocomplete.h" + +#include "ui/gtk/old-gtk-compat.h" #define BUTTON_SIZE_X -1 #define BUTTON_SIZE_Y -1 diff --git a/gtk/color_edit_dlg.h b/ui/gtk/color_edit_dlg.h index e54fc3eff5..e54fc3eff5 100644 --- a/gtk/color_edit_dlg.h +++ b/ui/gtk/color_edit_dlg.h diff --git a/gtk/color_utils.c b/ui/gtk/color_utils.c index abd15896fe..7e2d9243ed 100644 --- a/gtk/color_utils.c +++ b/ui/gtk/color_utils.c @@ -33,8 +33,8 @@ #include "../color.h" #include "../simple_dialog.h" -#include "gtk/color_utils.h" -#include "gtk/gtkglobals.h" +#include "ui/gtk/color_utils.h" +#include "ui/gtk/gtkglobals.h" #if 0 static GdkColormap* sys_cmap; static GdkColormap* our_cmap = NULL; diff --git a/gtk/color_utils.h b/ui/gtk/color_utils.h index 9562a32a5d..9562a32a5d 100644 --- a/gtk/color_utils.h +++ b/ui/gtk/color_utils.h diff --git a/gtk/compare_stat.c b/ui/gtk/compare_stat.c index c0f3b95325..ea487c4964 100644 --- a/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -60,10 +60,10 @@ #include "../simple_dialog.h" #include "../timestats.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/stock_icons.h" -#include "gtk/help_dlg.h" -#include "gtk/filter_autocomplete.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/filter_autocomplete.h" #include "gui_utils.h" #include "dlg_utils.h" @@ -81,7 +81,7 @@ #include "color_dlg.h" #include "new_packet_list.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" /* From colorize convertion */ #define COLOR_N 1 diff --git a/gtk/conversations_eth.c b/ui/gtk/conversations_eth.c index 664a1d50c0..336578d2f0 100644 --- a/gtk/conversations_eth.c +++ b/ui/gtk/conversations_eth.c @@ -41,8 +41,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/conversations_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/conversations_table.h" static int eth_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/conversations_fc.c b/ui/gtk/conversations_fc.c index a816ee29fa..f1e0b3c58f 100644 --- a/gtk/conversations_fc.c +++ b/ui/gtk/conversations_fc.c @@ -42,8 +42,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/conversations_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/conversations_table.h" static int diff --git a/gtk/conversations_fddi.c b/ui/gtk/conversations_fddi.c index a0a2028450..fcd721b6a1 100644 --- a/gtk/conversations_fddi.c +++ b/ui/gtk/conversations_fddi.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/conversations_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/conversations_table.h" static int fddi_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/conversations_ip.c b/ui/gtk/conversations_ip.c index f64a033b72..d77fb5c6a8 100644 --- a/gtk/conversations_ip.c +++ b/ui/gtk/conversations_ip.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/conversations_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/conversations_table.h" static int ip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/conversations_ipv6.c b/ui/gtk/conversations_ipv6.c index 8f1a94d997..83e9585e42 100644 --- a/gtk/conversations_ipv6.c +++ b/ui/gtk/conversations_ipv6.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/conversations_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/conversations_table.h" static int ipv6_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/conversations_ipx.c b/ui/gtk/conversations_ipx.c index 05cb2bf871..481e5a6d48 100644 --- a/gtk/conversations_ipx.c +++ b/ui/gtk/conversations_ipx.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/conversations_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/conversations_table.h" static int diff --git a/gtk/conversations_jxta.c b/ui/gtk/conversations_jxta.c index 82cd28b2f5..e56ac0e118 100644 --- a/gtk/conversations_jxta.c +++ b/ui/gtk/conversations_jxta.c @@ -41,8 +41,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/conversations_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/conversations_table.h" static int jxta_conversation_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/conversations_ncp.c b/ui/gtk/conversations_ncp.c index 95501cc60d..058da489ab 100644 --- a/gtk/conversations_ncp.c +++ b/ui/gtk/conversations_ncp.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/conversations_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/conversations_table.h" static int ncp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/conversations_rsvp.c b/ui/gtk/conversations_rsvp.c index 82bc7b7cb5..a5ddf2b3c8 100644 --- a/gtk/conversations_rsvp.c +++ b/ui/gtk/conversations_rsvp.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/conversations_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/conversations_table.h" static int rsvp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/conversations_sctp.c b/ui/gtk/conversations_sctp.c index a835588167..e7c5379ea5 100644 --- a/gtk/conversations_sctp.c +++ b/ui/gtk/conversations_sctp.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/conversations_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/conversations_table.h" static int sctp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/conversations_table.c b/ui/gtk/conversations_table.c index bd677d0b26..5573b8162a 100644 --- a/gtk/conversations_table.c +++ b/ui/gtk/conversations_table.c @@ -42,19 +42,19 @@ #include "../simple_dialog.h" #include "../globals.h" -#include "gtk/sat.h" -#include "gtk/conversations_table.h" -#include "gtk/filter_utils.h" -#include "gtk/gtkglobals.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/help_dlg.h" -#include "gtk/main.h" -#include "gtk/stock_icons.h" -#include "gtk/follow_tcp.h" -#include "gtk/follow_udp.h" -#include "gtk/keys.h" -#include "gtk/utf8_entities.h" +#include "ui/gtk/sat.h" +#include "ui/gtk/conversations_table.h" +#include "ui/gtk/filter_utils.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/main.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/follow_tcp.h" +#include "ui/gtk/follow_udp.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/utf8_entities.h" #include "old-gtk-compat.h" diff --git a/gtk/conversations_table.h b/ui/gtk/conversations_table.h index 42596982a2..42596982a2 100644 --- a/gtk/conversations_table.h +++ b/ui/gtk/conversations_table.h diff --git a/gtk/conversations_tcpip.c b/ui/gtk/conversations_tcpip.c index 2f250f1561..ce5f02b65a 100644 --- a/gtk/conversations_tcpip.c +++ b/ui/gtk/conversations_tcpip.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/conversations_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/conversations_table.h" static int tcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/conversations_tr.c b/ui/gtk/conversations_tr.c index bddda85881..13f8306872 100644 --- a/gtk/conversations_tr.c +++ b/ui/gtk/conversations_tr.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/conversations_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/conversations_table.h" static int tr_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/conversations_udpip.c b/ui/gtk/conversations_udpip.c index d12d631e24..34360c0376 100644 --- a/gtk/conversations_udpip.c +++ b/ui/gtk/conversations_udpip.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/conversations_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/conversations_table.h" static int udpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/conversations_usb.c b/ui/gtk/conversations_usb.c index 16004ae9af..2bd4af3c5a 100644 --- a/gtk/conversations_usb.c +++ b/ui/gtk/conversations_usb.c @@ -39,8 +39,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/conversations_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/conversations_table.h" static int usb_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_) diff --git a/gtk/conversations_wlan.c b/ui/gtk/conversations_wlan.c index 5d9383df2f..b4579cfbe1 100644 --- a/gtk/conversations_wlan.c +++ b/ui/gtk/conversations_wlan.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/conversations_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/conversations_table.h" static int wlan_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c index 5255fec740..e44b5bc20b 100644 --- a/gtk/dcerpc_stat.c +++ b/ui/gtk/dcerpc_stat.c @@ -47,17 +47,17 @@ #include "../stat_menu.h" #include "../simple_dialog.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/filter_dlg.h" -#include "gtk/stock_icons.h" -#include "gtk/service_response_time_table.h" -#include "gtk/gtkglobals.h" -#include "gtk/main.h" -#include "gtk/filter_autocomplete.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/service_response_time_table.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/main.h" +#include "ui/gtk/filter_autocomplete.h" + +#include "ui/gtk/old-gtk-compat.h" /* used to keep track of the statistics for an entire program interface */ typedef struct _dcerpcstat_t { diff --git a/gtk/decode_as_ber.c b/ui/gtk/decode_as_ber.c index 228f2cc252..13d8131ccf 100644 --- a/gtk/decode_as_ber.c +++ b/ui/gtk/decode_as_ber.c @@ -34,11 +34,11 @@ #include "../simple_dialog.h" -#include "gtk/decode_as_dlg.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/decode_as_dcerpc.h" -#include "gtk/decode_as_ber.h" +#include "ui/gtk/decode_as_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/decode_as_dcerpc.h" +#include "ui/gtk/decode_as_ber.h" /**************************************************/ diff --git a/gtk/decode_as_ber.h b/ui/gtk/decode_as_ber.h index fb910cc07e..fb910cc07e 100644 --- a/gtk/decode_as_ber.h +++ b/ui/gtk/decode_as_ber.h diff --git a/gtk/decode_as_dcerpc.c b/ui/gtk/decode_as_dcerpc.c index 6329480bee..202e73a8a7 100644 --- a/gtk/decode_as_dcerpc.c +++ b/ui/gtk/decode_as_dcerpc.c @@ -34,10 +34,10 @@ #include "../simple_dialog.h" -#include "gtk/decode_as_dlg.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/decode_as_dcerpc.h" +#include "ui/gtk/decode_as_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/decode_as_dcerpc.h" /**************************************************/ diff --git a/gtk/decode_as_dcerpc.h b/ui/gtk/decode_as_dcerpc.h index 07a6765b6a..07a6765b6a 100644 --- a/gtk/decode_as_dcerpc.h +++ b/ui/gtk/decode_as_dcerpc.h diff --git a/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c index e79a0568a2..8f954eeb3d 100644 --- a/gtk/decode_as_dlg.c +++ b/ui/gtk/decode_as_dlg.c @@ -43,13 +43,13 @@ #include "../simple_dialog.h" -#include "gtk/main.h" -#include "gtk/decode_as_dlg.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/decode_as_dcerpc.h" -#include "gtk/decode_as_ber.h" -#include "gtk/help_dlg.h" +#include "ui/gtk/main.h" +#include "ui/gtk/decode_as_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/decode_as_dcerpc.h" +#include "ui/gtk/decode_as_ber.h" +#include "ui/gtk/help_dlg.h" #include "utf8_entities.h" #undef DEBUG diff --git a/gtk/decode_as_dlg.h b/ui/gtk/decode_as_dlg.h index efe32d0f76..efe32d0f76 100644 --- a/gtk/decode_as_dlg.h +++ b/ui/gtk/decode_as_dlg.h diff --git a/gtk/dfilter_expr_dlg.c b/ui/gtk/dfilter_expr_dlg.c index db43dc2f72..da690b5a01 100644 --- a/gtk/dfilter_expr_dlg.c +++ b/ui/gtk/dfilter_expr_dlg.c @@ -49,14 +49,14 @@ #include "../simple_dialog.h" -#include "gtk/main.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/proto_dlg.h" -#include "gtk/filter_dlg.h" -#include "gtk/dfilter_expr_dlg.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/main.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/proto_dlg.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/dfilter_expr_dlg.h" + +#include "ui/gtk/old-gtk-compat.h" #define E_DFILTER_EXPR_TREE_KEY "dfilter_expr_tree" #define E_DFILTER_EXPR_CURRENT_VAR_KEY "dfilter_expr_current_var" diff --git a/gtk/dfilter_expr_dlg.h b/ui/gtk/dfilter_expr_dlg.h index 8975bbc857..8975bbc857 100644 --- a/gtk/dfilter_expr_dlg.h +++ b/ui/gtk/dfilter_expr_dlg.h diff --git a/gtk/diameter_stat.c b/ui/gtk/diameter_stat.c index fb63a59dfe..3c6733f588 100644 --- a/gtk/diameter_stat.c +++ b/ui/gtk/diameter_stat.c @@ -47,14 +47,14 @@ #include "../file.h" #include "../stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/service_response_time_table.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gtkglobals.h" -#include "gtk/main.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/service_response_time_table.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/main.h" + +#include "ui/gtk/old-gtk-compat.h" /* used to keep track of the statistics for an entire program interface */ typedef struct _diameterstat_t { diff --git a/gtk/dissector_tables_dlg.c b/ui/gtk/dissector_tables_dlg.c index 324ea1d09e..ce5c59a1cf 100644 --- a/gtk/dissector_tables_dlg.c +++ b/ui/gtk/dissector_tables_dlg.c @@ -36,9 +36,9 @@ #include <epan/packet.h> #include <gtk/gtk.h> -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/dissector_tables_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/dissector_tables_dlg.h" static GtkWidget *dissector_tables_dlg_w = NULL; diff --git a/gtk/dissector_tables_dlg.h b/ui/gtk/dissector_tables_dlg.h index 6f21d225c3..6f21d225c3 100644 --- a/gtk/dissector_tables_dlg.h +++ b/ui/gtk/dissector_tables_dlg.h diff --git a/gtk/dlg_utils.c b/ui/gtk/dlg_utils.c index 1f9cc89a77..3a77689e0c 100644 --- a/gtk/dlg_utils.c +++ b/ui/gtk/dlg_utils.c @@ -30,10 +30,10 @@ #include <gtk/gtk.h> -#include "gtk/gtkglobals.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/stock_icons.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/stock_icons.h" #include "epan/filesystem.h" diff --git a/gtk/dlg_utils.h b/ui/gtk/dlg_utils.h index 78e538895d..78e538895d 100644 --- a/gtk/dlg_utils.h +++ b/ui/gtk/dlg_utils.h diff --git a/gtk/doxygen.cfg.in b/ui/gtk/doxygen.cfg.in index 05b425271a..05b425271a 100644 --- a/gtk/doxygen.cfg.in +++ b/ui/gtk/doxygen.cfg.in diff --git a/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c index e4ae20feef..43e2fb664c 100644 --- a/gtk/drag_and_drop.c +++ b/ui/gtk/drag_and_drop.c @@ -43,16 +43,16 @@ #include "../capture.h" #endif -#include "gtk/gtkglobals.h" -#include "gtk/capture_file_dlg.h" -#include "gtk/drag_and_drop.h" -#include "gtk/main.h" -#include "gtk/menus.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/capture_file_dlg.h" +#include "ui/gtk/drag_and_drop.h" +#include "ui/gtk/main.h" +#include "ui/gtk/menus.h" #ifdef HAVE_LIBPCAP -#include "gtk/capture_globals.h" +#include "ui/gtk/capture_globals.h" #endif -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" #ifdef HAVE_GTKOSXAPPLICATION #include <igemacintegration/gtkosxapplication.h> diff --git a/gtk/drag_and_drop.h b/ui/gtk/drag_and_drop.h index 0ea47eb153..0ea47eb153 100644 --- a/gtk/drag_and_drop.h +++ b/ui/gtk/drag_and_drop.h diff --git a/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c index 624c5a6629..85fb78bcc4 100644 --- a/gtk/expert_comp_dlg.c +++ b/ui/gtk/expert_comp_dlg.c @@ -42,17 +42,17 @@ #include "../simple_dialog.h" #include "../stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/expert_comp_table.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/help_dlg.h" -#include "gtk/expert_comp_dlg.h" -#include "gtk/stock_icons.h" -#include "gtk/main.h" -#include "gtk/expert_indicators.h" -#include "gtk/main_proto_draw.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/expert_comp_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/expert_comp_dlg.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/main.h" +#include "ui/gtk/expert_indicators.h" +#include "ui/gtk/main_proto_draw.h" +#include "ui/gtk/old-gtk-compat.h" enum { diff --git a/gtk/expert_comp_dlg.h b/ui/gtk/expert_comp_dlg.h index 2e54607bd0..2e54607bd0 100644 --- a/gtk/expert_comp_dlg.h +++ b/ui/gtk/expert_comp_dlg.h diff --git a/gtk/expert_comp_table.c b/ui/gtk/expert_comp_table.c index fde2472487..153ff83b6c 100644 --- a/gtk/expert_comp_table.c +++ b/ui/gtk/expert_comp_table.c @@ -43,18 +43,18 @@ #include "../simple_dialog.h" -#include "gtk/expert_comp_table.h" -#include "gtk/filter_utils.h" -#include "gtk/find_dlg.h" -#include "gtk/color_dlg.h" -#include "gtk/main.h" -#include "gtk/gui_utils.h" -#include "gtk/gtkglobals.h" -#include "gtk/webbrowser.h" -#include "gtk/stock_icons.h" -#include "gtk/utf8_entities.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/expert_comp_table.h" +#include "ui/gtk/filter_utils.h" +#include "ui/gtk/find_dlg.h" +#include "ui/gtk/color_dlg.h" +#include "ui/gtk/main.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/webbrowser.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/utf8_entities.h" + +#include "ui/gtk/old-gtk-compat.h" const char *packet = "Packet:"; diff --git a/gtk/expert_comp_table.h b/ui/gtk/expert_comp_table.h index c8a099e2c0..c8a099e2c0 100644 --- a/gtk/expert_comp_table.h +++ b/ui/gtk/expert_comp_table.h diff --git a/gtk/expert_indicators.h b/ui/gtk/expert_indicators.h index b5a66e1207..b5a66e1207 100644 --- a/gtk/expert_indicators.h +++ b/ui/gtk/expert_indicators.h diff --git a/gtk/export_object.c b/ui/gtk/export_object.c index 6ab62ec57a..7d34fbbcf5 100644 --- a/gtk/export_object.c +++ b/ui/gtk/export_object.c @@ -46,13 +46,13 @@ #include <../simple_dialog.h> #include <wsutil/file_util.h> -#include <gtk/dlg_utils.h> -#include <gtk/file_dlg.h> -#include <gtk/gui_utils.h> -#include <gtk/help_dlg.h> -#include <gtk/main.h> -#include <gtk/stock_icons.h> -#include "gtk/export_object.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/main.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/export_object.h" #include <string.h> enum { diff --git a/gtk/export_object.h b/ui/gtk/export_object.h index 7ecdf36b19..7ecdf36b19 100644 --- a/gtk/export_object.h +++ b/ui/gtk/export_object.h diff --git a/gtk/export_object_dicom.c b/ui/gtk/export_object_dicom.c index c9acc48a80..3c7d0f4f46 100644 --- a/gtk/export_object_dicom.c +++ b/ui/gtk/export_object_dicom.c @@ -38,7 +38,7 @@ #include <epan/packet.h> #include <epan/tap.h> -#include "gtk/export_object.h" +#include "ui/gtk/export_object.h" static int eo_dicom_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, diff --git a/gtk/export_object_http.c b/ui/gtk/export_object_http.c index 9ad82a3ba4..5159b59f49 100644 --- a/gtk/export_object_http.c +++ b/ui/gtk/export_object_http.c @@ -35,7 +35,7 @@ #include <epan/dissectors/packet-http.h> #include <epan/tap.h> -#include "gtk/export_object.h" +#include "ui/gtk/export_object.h" static int diff --git a/gtk/export_object_smb.c b/ui/gtk/export_object_smb.c index 46684f75a9..e23411e56f 100644 --- a/gtk/export_object_smb.c +++ b/ui/gtk/export_object_smb.c @@ -38,7 +38,7 @@ #include <epan/dissectors/packet-smb.h> #include <epan/tap.h> -#include "gtk/export_object.h" +#include "ui/gtk/export_object.h" /* These flags show what kind of data the object contains diff --git a/gtk/export_sslkeys.c b/ui/gtk/export_sslkeys.c index fbb61e699d..f31b6f6d63 100644 --- a/gtk/export_sslkeys.c +++ b/ui/gtk/export_sslkeys.c @@ -64,19 +64,19 @@ #include "../progress_dlg.h" #include "../ui_util.h" -#include "gtk/keys.h" -#include "gtk/color_utils.h" -#include "gtk/capture_file_dlg.h" -#include "gtk/packet_win.h" -#include "gtk/file_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/gtkglobals.h" -#include "gtk/font_utils.h" -#include "gtk/webbrowser.h" -#include "gtk/main.h" -#include "gtk/menus.h" -#include "gtk/recent.h" -#include "gtk/export_sslkeys.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/color_utils.h" +#include "ui/gtk/capture_file_dlg.h" +#include "ui/gtk/packet_win.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/font_utils.h" +#include "ui/gtk/webbrowser.h" +#include "ui/gtk/main.h" +#include "ui/gtk/menus.h" +#include "ui/gtk/recent.h" +#include "ui/gtk/export_sslkeys.h" #ifdef _WIN32 #include <gdk/gdkwin32.h> diff --git a/gtk/export_sslkeys.h b/ui/gtk/export_sslkeys.h index 355f0046e4..355f0046e4 100644 --- a/gtk/export_sslkeys.h +++ b/ui/gtk/export_sslkeys.h diff --git a/gtk/fc_stat.c b/ui/gtk/fc_stat.c index 1cec78449a..362b0e41cf 100644 --- a/gtk/fc_stat.c +++ b/ui/gtk/fc_stat.c @@ -47,14 +47,14 @@ #include "../file.h" #include "../stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/service_response_time_table.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gtkglobals.h" -#include "gtk/main.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/service_response_time_table.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/main.h" + +#include "ui/gtk/old-gtk-compat.h" /* used to keep track of the statistics for an entire program interface */ typedef struct _fcstat_t { diff --git a/gtk/file_dlg.c b/ui/gtk/file_dlg.c index e5e9e6410e..0d57ddff60 100644 --- a/gtk/file_dlg.c +++ b/ui/gtk/file_dlg.c @@ -32,10 +32,10 @@ #include <wsutil/file_util.h> -#include "gtk/gtkglobals.h" -#include "gtk/gui_utils.h" -#include "gtk/file_dlg.h" -#include "gtk/keys.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/keys.h" static gchar *last_open_dir = NULL; diff --git a/gtk/file_dlg.h b/ui/gtk/file_dlg.h index 87dd8d4d8d..87dd8d4d8d 100644 --- a/gtk/file_dlg.h +++ b/ui/gtk/file_dlg.h diff --git a/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c index 1d7535d81c..b5a77358a6 100644 --- a/gtk/file_import_dlg.c +++ b/ui/gtk/file_import_dlg.c @@ -46,17 +46,17 @@ #include "simple_dialog.h" #include "alert_box.h" -#include "gtk/gtkglobals.h" -#include "gtk/stock_icons.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/file_dlg.h" -#include "gtk/capture_file_dlg.h" -#include "gtk/help_dlg.h" - -#include "gtk/file_import_dlg.h" -#include "gtk/text_import.h" -#include "gtk/text_import_scanner.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/capture_file_dlg.h" +#include "ui/gtk/help_dlg.h" + +#include "ui/gtk/file_import_dlg.h" +#include "ui/gtk/text_import.h" +#include "ui/gtk/text_import_scanner.h" #include "file.h" #include "wsutil/file_util.h" diff --git a/gtk/file_import_dlg.h b/ui/gtk/file_import_dlg.h index 573c0eb486..573c0eb486 100644 --- a/gtk/file_import_dlg.h +++ b/ui/gtk/file_import_dlg.h diff --git a/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c index c2900f4cf6..1684190587 100644 --- a/gtk/fileset_dlg.c +++ b/ui/gtk/fileset_dlg.c @@ -39,12 +39,12 @@ #include "../simple_dialog.h" #include "../fileset.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/main.h" -#include "gtk/menus.h" -#include "gtk/help_dlg.h" -#include "gtk/fileset_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/menus.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/fileset_dlg.h" diff --git a/gtk/fileset_dlg.h b/ui/gtk/fileset_dlg.h index 89fe16493a..89fe16493a 100644 --- a/gtk/fileset_dlg.h +++ b/ui/gtk/fileset_dlg.h diff --git a/gtk/filter_autocomplete.c b/ui/gtk/filter_autocomplete.c index 7ebe2e4bac..6a67b51eb8 100644 --- a/gtk/filter_autocomplete.c +++ b/ui/gtk/filter_autocomplete.c @@ -41,10 +41,10 @@ #include <epan/proto.h> -#include "gtk/gui_utils.h" -#include "gtk/filter_autocomplete.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/filter_autocomplete.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" #define E_FILT_AUTOCOMP_TREE_KEY "filter_autocomplete_tree" diff --git a/gtk/filter_autocomplete.h b/ui/gtk/filter_autocomplete.h index b7f6dada0c..b7f6dada0c 100644 --- a/gtk/filter_autocomplete.h +++ b/ui/gtk/filter_autocomplete.h diff --git a/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c index 3f6efade9c..1349826b06 100644 --- a/gtk/filter_dlg.c +++ b/ui/gtk/filter_dlg.c @@ -38,17 +38,17 @@ #include "../simple_dialog.h" #include "../main_statusbar.h" -#include "gtk/main.h" -#include "gtk/filter_dlg.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/dfilter_expr_dlg.h" -#include "gtk/stock_icons.h" -#include "gtk/gtkglobals.h" -#include "gtk/help_dlg.h" -#include "gtk/filter_autocomplete.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/main.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dfilter_expr_dlg.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/filter_autocomplete.h" + +#include "ui/gtk/old-gtk-compat.h" #define E_FILT_DIALOG_PTR_KEY "filter_dialog_ptr" #define E_FILT_BUTTON_PTR_KEY "filter_button_ptr" diff --git a/gtk/filter_dlg.h b/ui/gtk/filter_dlg.h index 84c4387bae..84c4387bae 100644 --- a/gtk/filter_dlg.h +++ b/ui/gtk/filter_dlg.h diff --git a/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c index 95ab006127..aa9e693e63 100644 --- a/gtk/filter_expression_save_dlg.c +++ b/ui/gtk/filter_expression_save_dlg.c @@ -45,15 +45,15 @@ #include "../simple_dialog.h" #include "../main_statusbar.h" -#include "gtk/gui_utils.h" -#include "gtk/filter_expression_save_dlg.h" -#include "gtk/dlg_utils.h" -#include "gtk/stock_icons.h" -#include "gtk/prefs_dlg.h" -#include "gtk/filter_dlg.h" -#include "gtk/filter_autocomplete.h" -#include "gtk/keys.h" -#include "gtk/help_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/filter_expression_save_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/prefs_dlg.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/filter_autocomplete.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/help_dlg.h" #include "ui_util.h" #include "main.h" diff --git a/gtk/filter_expression_save_dlg.h b/ui/gtk/filter_expression_save_dlg.h index 8c36e7e060..8c36e7e060 100644 --- a/gtk/filter_expression_save_dlg.h +++ b/ui/gtk/filter_expression_save_dlg.h diff --git a/gtk/filter_utils.c b/ui/gtk/filter_utils.c index c69d13a6e7..7aa30ccfbf 100644 --- a/gtk/filter_utils.c +++ b/ui/gtk/filter_utils.c @@ -28,13 +28,13 @@ #include <gtk/gtk.h> #include <string.h> -#include "gtk/main.h" -#include "gtk/gtkglobals.h" -#include "gtk/find_dlg.h" -#include "gtk/color_dlg.h" -#include "gtk/filter_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/find_dlg.h" +#include "ui/gtk/color_dlg.h" +#include "ui/gtk/filter_utils.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" void apply_selected_filter (guint callback_action, char *filter) diff --git a/gtk/filter_utils.h b/ui/gtk/filter_utils.h index 9b8d31a5b5..9b8d31a5b5 100644 --- a/gtk/filter_utils.h +++ b/ui/gtk/filter_utils.h diff --git a/gtk/find_dlg.c b/ui/gtk/find_dlg.c index c87a98eecc..c690f16dab 100644 --- a/gtk/find_dlg.c +++ b/ui/gtk/find_dlg.c @@ -41,16 +41,16 @@ #include "../simple_dialog.h" #include "../main_statusbar.h" -#include "gtk/gui_utils.h" -#include "gtk/find_dlg.h" -#include "gtk/filter_dlg.h" -#include "gtk/dlg_utils.h" -#include "gtk/stock_icons.h" -#include "gtk/prefs_dlg.h" -#include "gtk/keys.h" -#include "gtk/help_dlg.h" -#include "gtk/filter_autocomplete.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/find_dlg.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/prefs_dlg.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/filter_autocomplete.h" +#include "ui/gtk/old-gtk-compat.h" /* Capture callback data keys */ #define E_FIND_FILT_KEY "find_filter_te" diff --git a/gtk/find_dlg.h b/ui/gtk/find_dlg.h index d71f711372..d71f711372 100644 --- a/gtk/find_dlg.h +++ b/ui/gtk/find_dlg.h diff --git a/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c index 405f9ca552..72ffcfa405 100644 --- a/gtk/firewall_dlg.c +++ b/ui/gtk/firewall_dlg.c @@ -61,13 +61,13 @@ #include <../simple_dialog.h> #include <wsutil/file_util.h> -#include <gtk/main.h> -#include <gtk/dlg_utils.h> -#include <gtk/file_dlg.h> -#include <gtk/help_dlg.h> -#include <gtk/gui_utils.h> -#include "gtk/old-gtk-compat.h" -#include "gtk/firewall_dlg.h" +#include "ui/gtk/main.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/old-gtk-compat.h" +#include "ui/gtk/firewall_dlg.h" #define MAX_RULE_LEN 200 diff --git a/gtk/firewall_dlg.h b/ui/gtk/firewall_dlg.h index b457f7078b..b457f7078b 100644 --- a/gtk/firewall_dlg.h +++ b/ui/gtk/firewall_dlg.h diff --git a/gtk/flow_graph.c b/ui/gtk/flow_graph.c index 3fb6b32388..f8b62adeae 100644 --- a/gtk/flow_graph.c +++ b/ui/gtk/flow_graph.c @@ -43,13 +43,13 @@ #include "../stat_menu.h" #include "../simple_dialog.h" -#include "gtk/graph_analysis.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/stock_icons.h" -#include "gtk/gtkglobals.h" -#include "gtk/main.h" +#include "ui/gtk/graph_analysis.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/main.h" diff --git a/gtk/follow_ssl.c b/ui/gtk/follow_ssl.c index 82bc680c87..cee99305db 100644 --- a/gtk/follow_ssl.c +++ b/ui/gtk/follow_ssl.c @@ -51,16 +51,16 @@ #include <../util.h> #include "gtkglobals.h" -#include <gtk/color_utils.h> -#include <gtk/main.h> -#include <gtk/dlg_utils.h> -#include <gtk/file_dlg.h> -#include <gtk/keys.h> -#include <gtk/gui_utils.h> -#include <gtk/font_utils.h> -#include "gtk/follow_ssl.h" -#include "gtk/follow_stream.h" -#include "gtk/utf8_entities.h" +#include "ui/gtk/color_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/font_utils.h" +#include "ui/gtk/follow_ssl.h" +#include "ui/gtk/follow_stream.h" +#include "ui/gtk/utf8_entities.h" #ifdef SSL_PLUGIN #include "packet-ssl-utils.h" diff --git a/gtk/follow_ssl.h b/ui/gtk/follow_ssl.h index 4802f30168..4802f30168 100644 --- a/gtk/follow_ssl.h +++ b/ui/gtk/follow_ssl.h diff --git a/gtk/follow_stream.c b/ui/gtk/follow_stream.c index c2bc5ee4ba..6e08ae280c 100644 --- a/gtk/follow_stream.c +++ b/ui/gtk/follow_stream.c @@ -47,16 +47,16 @@ #include <../simple_dialog.h> #include <wsutil/file_util.h> -#include <gtk/color_utils.h> -#include <gtk/stock_icons.h> -#include <gtk/dlg_utils.h> -#include <gtk/follow_stream.h> -#include <gtk/font_utils.h> -#include <gtk/file_dlg.h> -#include <gtk/gui_utils.h> -#include <gtk/help_dlg.h> -#include "gtk/main.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/color_utils.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/follow_stream.h" +#include "ui/gtk/font_utils.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/main.h" +#include "ui/gtk/old-gtk-compat.h" #ifdef _WIN32 #include "../tempfile.h" diff --git a/gtk/follow_stream.h b/ui/gtk/follow_stream.h index 1d4fef6362..1d4fef6362 100644 --- a/gtk/follow_stream.h +++ b/ui/gtk/follow_stream.h diff --git a/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c index abfe66b088..ada4f65b55 100644 --- a/gtk/follow_tcp.c +++ b/ui/gtk/follow_tcp.c @@ -55,18 +55,18 @@ #include <wsutil/file_util.h> #include "gtkglobals.h" -#include "gtk/color_utils.h" -#include "gtk/follow_tcp.h" -#include "gtk/dlg_utils.h" -#include "gtk/file_dlg.h" -#include "gtk/keys.h" -#include "gtk/main.h" -#include "gtk/gui_utils.h" +#include "ui/gtk/color_utils.h" +#include "ui/gtk/follow_tcp.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/main.h" +#include "ui/gtk/gui_utils.h" #include "win32/print_win32.h" -#include "gtk/font_utils.h" -#include "gtk/help_dlg.h" -#include "gtk/follow_stream.h" -#include "gtk/utf8_entities.h" +#include "ui/gtk/font_utils.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/follow_stream.h" +#include "ui/gtk/utf8_entities.h" /* With MSVC and a libwireshark.dll, we need a special declaration. */ WS_VAR_IMPORT FILE *data_out_file; diff --git a/gtk/follow_tcp.h b/ui/gtk/follow_tcp.h index 8bea0ba0b6..8bea0ba0b6 100644 --- a/gtk/follow_tcp.h +++ b/ui/gtk/follow_tcp.h diff --git a/gtk/follow_udp.c b/ui/gtk/follow_udp.c index abfec12bde..a25f569d1d 100644 --- a/gtk/follow_udp.c +++ b/ui/gtk/follow_udp.c @@ -40,11 +40,11 @@ #include <../simple_dialog.h> #include "gtkglobals.h" -#include "gtk/follow_stream.h" -#include <gtk/keys.h> -#include <gtk/main.h> -#include "gtk/follow_udp.h" -#include "gtk/utf8_entities.h" +#include "ui/gtk/follow_stream.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/main.h" +#include "ui/gtk/follow_udp.h" +#include "ui/gtk/utf8_entities.h" static int udp_queue_packet_data(void *tapdata, packet_info *pinfo, diff --git a/gtk/follow_udp.h b/ui/gtk/follow_udp.h index 852e1c8392..852e1c8392 100644 --- a/gtk/follow_udp.h +++ b/ui/gtk/follow_udp.h diff --git a/gtk/font_utils.c b/ui/gtk/font_utils.c index e4d14b8e15..693087ed44 100644 --- a/gtk/font_utils.c +++ b/ui/gtk/font_utils.c @@ -42,13 +42,13 @@ #include "../simple_dialog.h" -#include "gtk/main.h" -#include "gtk/recent.h" -#include "gtk/gtkglobals.h" -#include "gtk/font_utils.h" -#include "gtk/main_proto_draw.h" -#include "gtk/follow_tcp.h" -#include "gtk/new_packet_list.h" +#include "ui/gtk/main.h" +#include "ui/gtk/recent.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/font_utils.h" +#include "ui/gtk/main_proto_draw.h" +#include "ui/gtk/follow_tcp.h" +#include "ui/gtk/new_packet_list.h" static PangoFontDescription *m_r_font, *m_b_font; diff --git a/gtk/font_utils.h b/ui/gtk/font_utils.h index d31338eb5e..d31338eb5e 100644 --- a/gtk/font_utils.h +++ b/ui/gtk/font_utils.h diff --git a/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c index ed71cef50e..afc1bb9871 100644 --- a/gtk/funnel_stat.c +++ b/ui/gtk/funnel_stat.c @@ -59,15 +59,15 @@ #include "../progress_dlg.h" #include "../color_filters.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/font_utils.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/prefs_dlg.h" -#include "gtk/main.h" -#include "gtk/webbrowser.h" -#include "gtk/gtkglobals.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/font_utils.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/prefs_dlg.h" +#include "ui/gtk/main.h" +#include "ui/gtk/webbrowser.h" +#include "ui/gtk/gtkglobals.h" struct _funnel_text_window_t { diff --git a/gtk/goto_dlg.c b/ui/gtk/goto_dlg.c index e8546a5e70..a014c02895 100644 --- a/gtk/goto_dlg.c +++ b/ui/gtk/goto_dlg.c @@ -35,10 +35,10 @@ #include "../simple_dialog.h" #include "../ui_util.h" -#include "gtk/goto_dlg.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/help_dlg.h" +#include "ui/gtk/goto_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/help_dlg.h" /* Capture callback data keys */ diff --git a/gtk/goto_dlg.h b/ui/gtk/goto_dlg.h index 3a50a99cf5..3a50a99cf5 100644 --- a/gtk/goto_dlg.h +++ b/ui/gtk/goto_dlg.h diff --git a/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c index d8dd6df888..430927403e 100644 --- a/gtk/graph_analysis.c +++ b/ui/gtk/graph_analysis.c @@ -56,15 +56,15 @@ #include "../alert_box.h" #include <wsutil/file_util.h> -#include "gtk/gtkglobals.h" -#include "gtk/file_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/main.h" -#include "gtk/graph_analysis.h" -#include "gtk/recent.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/graph_analysis.h" +#include "ui/gtk/recent.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" #include "../image/voip_bg.xpm" @@ -79,7 +79,7 @@ static GtkWidget *save_to_file_w = NULL; #define TOP_Y_BORDER 40 #define BOTTOM_Y_BORDER 2 #define COMMENT_WIDTH 400 -#define TIME_WIDTH 150 +#define TIME_WIDTH 50 #define NODE_CHARS_WIDTH 20 #define CONV_TIME_HEADER "Conv.| Time " @@ -305,7 +305,9 @@ static gboolean dialog_graph_dump_to_file(graph_analysis_data_t *user_data) GString *label_string, *empty_line,*separator_line, *tmp_str, *tmp_str2; char *empty_header; char src_port[8],dst_port[8]; +#if 0 gchar *time_str = g_malloc(COL_MAX_LEN); +#endif GList *list; FILE *of; @@ -443,13 +445,13 @@ static gboolean dialog_graph_dump_to_file(graph_analysis_data_t *user_data) fprintf(of, "%s", label_string->str); } -#if 0 /* write the time */ g_string_printf(label_string, "|%.3f", nstime_to_sec(&gai->fd->rel_ts)); -#endif - /* Write the time, using the same format as in the time col */ +#if 0 + /* Write the time, using the same format as in th etime col */ set_fd_time(gai->fd, time_str); g_string_printf(label_string, "|%s", time_str); +#endif enlarge_string(label_string, 10, ' '); fprintf(of, "%s", label_string->str); @@ -507,7 +509,9 @@ exit: g_string_free(separator_line, TRUE); g_string_free(tmp_str, TRUE); g_string_free(tmp_str2, TRUE); +#if 0 g_free(time_str); +#endif fclose (of); return TRUE; @@ -663,7 +667,9 @@ static void dialog_graph_draw(graph_analysis_data_t *user_data) char label_string[MAX_COMMENT]; GList *list; cairo_t *cr; +#if 0 gchar *time_str = g_malloc(COL_MAX_LEN); +#endif GdkColor *color_p, *bg_color_p; GdkColor black_color = {0, 0, 0, 0}; @@ -810,12 +816,13 @@ static void dialog_graph_draw(graph_analysis_data_t *user_data) /* Calculate the x borders */ /* We use time from the last display item to calcultate the x left border */ -#if 0 + /* XXX TODO: Use recent.gui_time_format to chose time format */ g_snprintf(label_string, MAX_LABEL, "%.3f", nstime_to_sec(&user_data->dlg.items[display_items-1].fd->rel_ts)); -#endif +#if 0 /* Write the time, using the same format as in th etime col */ set_fd_time(user_data->dlg.items[display_items-1].fd, time_str); g_snprintf(label_string, MAX_LABEL, "%s", time_str); +#endif layout = gtk_widget_create_pango_layout(user_data->dlg.draw_area_time, label_string); middle_layout = gtk_widget_create_pango_layout(user_data->dlg.draw_area_time, label_string); small_layout = gtk_widget_create_pango_layout(user_data->dlg.draw_area_time, label_string); @@ -1002,13 +1009,12 @@ static void dialog_graph_draw(graph_analysis_data_t *user_data) /* Draw the items */ for (current_item=0; current_item<display_items; current_item++){ -#if 0 /* Draw the time */ g_snprintf(label_string, MAX_LABEL, "%.3f", nstime_to_sec(&user_data->dlg.items[current_item].fd->rel_ts)); -#endif - /* Draw the time */ +#if 0 set_fd_time(user_data->dlg.items[current_item].fd, time_str); g_snprintf(label_string, MAX_LABEL, "%s", time_str); +#endif pango_layout_set_text(layout, label_string, -1); pango_layout_get_pixel_size(layout, &label_width, &label_height); #if GTK_CHECK_VERSION(2,22,0) @@ -1245,8 +1251,9 @@ static void dialog_graph_draw(graph_analysis_data_t *user_data) } g_object_unref(G_OBJECT(layout)); +#if 0 g_free(time_str); - +#endif /* refresh the draw areas */ if (gtk_widget_is_drawable(user_data->dlg.draw_area_time) ){ cr = gdk_cairo_create (gtk_widget_get_window(user_data->dlg.draw_area_time)); @@ -1753,7 +1760,7 @@ static void create_draw_area(graph_analysis_data_t *user_data, GtkWidget *box) hbox=gtk_hbox_new(FALSE, 0); gtk_widget_show(hbox); - /* create "time" draw area */ + /* create "time" draw area */ user_data->dlg.draw_area_time=gtk_drawing_area_new(); gtk_widget_set_size_request(user_data->dlg.draw_area_time, TIME_WIDTH, user_data->dlg.surface_height); frame_time = gtk_frame_new(NULL); @@ -1861,7 +1868,6 @@ static void create_draw_area(graph_analysis_data_t *user_data, GtkWidget *box) gtk_widget_show(user_data->dlg.scroll_window); gtk_widget_show(scroll_window_comments); - /* Allow the hbox with time to expand (TRUE, TRUE) */ gtk_box_pack_start(GTK_BOX(hbox), frame_time, FALSE, FALSE, 3); user_data->dlg.hpane = gtk_hpaned_new(); diff --git a/gtk/graph_analysis.h b/ui/gtk/graph_analysis.h index 31d46d8786..31d46d8786 100644 --- a/gtk/graph_analysis.h +++ b/ui/gtk/graph_analysis.h diff --git a/gtk/gsm_a_stat.c b/ui/gtk/gsm_a_stat.c index 8ffb5aa33a..5f39e516d7 100644 --- a/gtk/gsm_a_stat.c +++ b/ui/gtk/gsm_a_stat.c @@ -48,12 +48,12 @@ #include "../stat_menu.h" #include "../simple_dialog.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/filter_dlg.h" -#include "gtk/gui_utils.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/gui_utils.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" enum { diff --git a/gtk/gsm_map_stat.c b/ui/gtk/gsm_map_stat.c index 9e1e587a8d..4da736065b 100644 --- a/gtk/gsm_map_stat.c +++ b/ui/gtk/gsm_map_stat.c @@ -49,13 +49,13 @@ #include "../stat_menu.h" #include "../simple_dialog.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/filter_dlg.h" -#include "gtk/gsm_map_stat.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/gsm_map_stat.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" enum { diff --git a/gtk/gsm_map_stat.h b/ui/gtk/gsm_map_stat.h index f5290c77ee..f5290c77ee 100644 --- a/gtk/gsm_map_stat.h +++ b/ui/gtk/gsm_map_stat.h diff --git a/gtk/gsm_map_summary.c b/ui/gtk/gsm_map_summary.c index 4da1a0b255..6651a47661 100644 --- a/gtk/gsm_map_summary.c +++ b/ui/gtk/gsm_map_summary.c @@ -52,10 +52,10 @@ #include "../file.h" #include "../summary.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/gsm_map_stat.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/gsm_map_stat.h" #define SUM_STR_MAX 1024 diff --git a/gtk/gtkglobals.h b/ui/gtk/gtkglobals.h index f4d4ab7ac4..f4d4ab7ac4 100644 --- a/gtk/gtkglobals.h +++ b/ui/gtk/gtkglobals.h diff --git a/gtk/gtp_stat.c b/ui/gtk/gtp_stat.c index 8227e74adb..ba095c760d 100644 --- a/gtk/gtp_stat.c +++ b/ui/gtk/gtp_stat.c @@ -46,14 +46,14 @@ #include "../file.h" #include "../stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/service_response_time_table.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gtkglobals.h" -#include "gtk/main.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/service_response_time_table.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/main.h" + +#include "ui/gtk/old-gtk-compat.h" /* used to keep track of the statistics for an entire program interface */ typedef struct _gtpstat_t { diff --git a/gtk/gui_stat_menu.h b/ui/gtk/gui_stat_menu.h index d36580a3af..d36580a3af 100644 --- a/gtk/gui_stat_menu.h +++ b/ui/gtk/gui_stat_menu.h diff --git a/gtk/gui_stat_util.c b/ui/gtk/gui_stat_util.c index eabc6d2835..8ae18b69eb 100644 --- a/gtk/gui_stat_util.c +++ b/ui/gtk/gui_stat_util.c @@ -39,7 +39,7 @@ #include "../simple_dialog.h" #include "../file.h" -#include "gtk/gui_stat_util.h" +#include "ui/gtk/gui_stat_util.h" /* insert a string into a GTK_TABLE at column x and row y*/ diff --git a/gtk/gui_stat_util.h b/ui/gtk/gui_stat_util.h index 64f5420aae..64f5420aae 100644 --- a/gtk/gui_stat_util.h +++ b/ui/gtk/gui_stat_util.h diff --git a/gtk/gui_utils.c b/ui/gtk/gui_utils.c index 6fcdcbe588..f21c95b42b 100644 --- a/gtk/gui_utils.c +++ b/ui/gtk/gui_utils.c @@ -44,12 +44,12 @@ #include "../ui_util.h" #include <wsutil/file_util.h> -#include "gtk/gtkglobals.h" -#include "gtk/gui_utils.h" -#include "gtk/font_utils.h" -#include "gtk/recent.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/font_utils.h" +#include "ui/gtk/recent.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" #include "image/wsicon16.xpm" #include "image/wsicon32.xpm" diff --git a/gtk/gui_utils.h b/ui/gtk/gui_utils.h index 9720a2a0d6..9720a2a0d6 100644 --- a/gtk/gui_utils.h +++ b/ui/gtk/gui_utils.h diff --git a/gtk/h225_counter.c b/ui/gtk/h225_counter.c index aac3d9a93b..bd988947de 100644 --- a/gtk/h225_counter.c +++ b/ui/gtk/h225_counter.c @@ -46,13 +46,13 @@ #include "../file.h" #include "../stat_menu.h" -#include "gtk/gui_stat_util.h" -#include "gtk/dlg_utils.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/main.h" +#include "ui/gtk/gui_stat_util.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/main.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" static void gtk_h225counter_init(const char *optarg, void *userdata); diff --git a/gtk/h225_ras_srt.c b/ui/gtk/h225_ras_srt.c index bd63d76285..2f2974ee6e 100644 --- a/gtk/h225_ras_srt.c +++ b/ui/gtk/h225_ras_srt.c @@ -47,13 +47,13 @@ #include "../file.h" #include "../stat_menu.h" -#include "gtk/gui_stat_util.h" -#include "gtk/dlg_utils.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/main.h" +#include "ui/gtk/gui_stat_util.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/main.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" static void gtk_h225rassrt_init(const char *optarg, void *userdata); diff --git a/gtk/help_dlg.c b/ui/gtk/help_dlg.c index b9eb30cf26..43f647412b 100644 --- a/gtk/help_dlg.c +++ b/ui/gtk/help_dlg.c @@ -37,12 +37,12 @@ #include "../simple_dialog.h" -#include "gtk/help_dlg.h" -#include "gtk/text_page_utils.h" -#include "gtk/gtkglobals.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/webbrowser.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/text_page_utils.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/webbrowser.h" #ifdef HHC_DIR #include <windows.h> diff --git a/gtk/help_dlg.h b/ui/gtk/help_dlg.h index 1626ff5093..1626ff5093 100644 --- a/gtk/help_dlg.h +++ b/ui/gtk/help_dlg.h diff --git a/gtk/hostlist_eth.c b/ui/gtk/hostlist_eth.c index 644985f1d8..9bc195e449 100644 --- a/gtk/hostlist_eth.c +++ b/ui/gtk/hostlist_eth.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/hostlist_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/hostlist_table.h" static int diff --git a/gtk/hostlist_fc.c b/ui/gtk/hostlist_fc.c index 0e2e153553..f60bf91063 100644 --- a/gtk/hostlist_fc.c +++ b/ui/gtk/hostlist_fc.c @@ -42,8 +42,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/hostlist_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/hostlist_table.h" static int diff --git a/gtk/hostlist_fddi.c b/ui/gtk/hostlist_fddi.c index 6764523c3f..6a01134d7f 100644 --- a/gtk/hostlist_fddi.c +++ b/ui/gtk/hostlist_fddi.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/hostlist_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/hostlist_table.h" static int fddi_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_ip.c b/ui/gtk/hostlist_ip.c index 186a691e7c..7d7ac874df 100644 --- a/gtk/hostlist_ip.c +++ b/ui/gtk/hostlist_ip.c @@ -42,8 +42,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/hostlist_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/hostlist_table.h" static int ip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_ipv6.c b/ui/gtk/hostlist_ipv6.c index 4d3e04ed4d..fe0991999c 100644 --- a/gtk/hostlist_ipv6.c +++ b/ui/gtk/hostlist_ipv6.c @@ -43,8 +43,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/hostlist_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/hostlist_table.h" static int ipv6_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_ipx.c b/ui/gtk/hostlist_ipx.c index 79cac56300..802c055ac2 100644 --- a/gtk/hostlist_ipx.c +++ b/ui/gtk/hostlist_ipx.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/hostlist_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/hostlist_table.h" static int ipx_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_jxta.c b/ui/gtk/hostlist_jxta.c index 41ba709a7c..95c0f517c8 100644 --- a/gtk/hostlist_jxta.c +++ b/ui/gtk/hostlist_jxta.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/hostlist_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/hostlist_table.h" static int jxta_hostlist_packet(void *pit, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_ncp.c b/ui/gtk/hostlist_ncp.c index f3c98f1c2e..2a03d780d3 100644 --- a/gtk/hostlist_ncp.c +++ b/ui/gtk/hostlist_ncp.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/hostlist_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/hostlist_table.h" static int ncp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_) diff --git a/gtk/hostlist_rsvp.c b/ui/gtk/hostlist_rsvp.c index 03510eeee9..ccbe88cb37 100644 --- a/gtk/hostlist_rsvp.c +++ b/ui/gtk/hostlist_rsvp.c @@ -42,8 +42,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/hostlist_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/hostlist_table.h" static int rsvp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_sctp.c b/ui/gtk/hostlist_sctp.c index db275ee45c..132e831a93 100644 --- a/gtk/hostlist_sctp.c +++ b/ui/gtk/hostlist_sctp.c @@ -39,8 +39,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/hostlist_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/hostlist_table.h" static int sctp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c index 7ad1ad4f1f..923262777e 100644 --- a/gtk/hostlist_table.c +++ b/ui/gtk/hostlist_table.c @@ -53,21 +53,21 @@ #include "../alert_box.h" #include "../tempfile.h" -#include "gtk/hostlist_table.h" -#include "gtk/filter_utils.h" -#include "gtk/gtkglobals.h" - -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/help_dlg.h" -#include "gtk/main.h" -#include "gtk/utf8_entities.h" +#include "ui/gtk/hostlist_table.h" +#include "ui/gtk/filter_utils.h" +#include "ui/gtk/gtkglobals.h" + +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/main.h" +#include "ui/gtk/utf8_entities.h" #ifdef HAVE_GEOIP -#include "gtk/webbrowser.h" -#include "gtk/stock_icons.h" +#include "ui/gtk/webbrowser.h" +#include "ui/gtk/stock_icons.h" #endif -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" #define HOST_PTR_KEY "hostlist-pointer" #define NB_PAGES_KEY "notebook-pages" diff --git a/gtk/hostlist_table.h b/ui/gtk/hostlist_table.h index a41119a90e..a41119a90e 100644 --- a/gtk/hostlist_table.h +++ b/ui/gtk/hostlist_table.h diff --git a/gtk/hostlist_tcpip.c b/ui/gtk/hostlist_tcpip.c index b0f521a9c4..e7aec10e9a 100644 --- a/gtk/hostlist_tcpip.c +++ b/ui/gtk/hostlist_tcpip.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/hostlist_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/hostlist_table.h" static int tcpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_tr.c b/ui/gtk/hostlist_tr.c index aa22d62843..a9ce34a13d 100644 --- a/gtk/hostlist_tr.c +++ b/ui/gtk/hostlist_tr.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/hostlist_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/hostlist_table.h" static int tr_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_udpip.c b/ui/gtk/hostlist_udpip.c index 7dd735eaf3..4d88452bf6 100644 --- a/gtk/hostlist_udpip.c +++ b/ui/gtk/hostlist_udpip.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/hostlist_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/hostlist_table.h" static int udpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_usb.c b/ui/gtk/hostlist_usb.c index 0bb4d9776f..873cea941e 100644 --- a/gtk/hostlist_usb.c +++ b/ui/gtk/hostlist_usb.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/hostlist_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/hostlist_table.h" static int usb_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_) diff --git a/gtk/hostlist_wlan.c b/ui/gtk/hostlist_wlan.c index 56e51eb922..d3b5f99a81 100644 --- a/gtk/hostlist_wlan.c +++ b/ui/gtk/hostlist_wlan.c @@ -40,8 +40,8 @@ #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/hostlist_table.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/hostlist_table.h" static int wlan_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 69e811c9ec..cbd48671ce 100644 --- a/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -73,19 +73,19 @@ #include "../tempfile.h" #include <wsutil/file_util.h> -#include "gtk/gtkglobals.h" -#include "gtk/dlg_utils.h" -#include "gtk/file_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/main.h" -#include "gtk/rtp_analysis.h" -#include "gtk/iax2_analysis.h" -#include "gtk/rtp_stream.h" -#include "gtk/rtp_stream_dlg.h" -#include "gtk/utf8_entities.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/main.h" +#include "ui/gtk/rtp_analysis.h" +#include "ui/gtk/iax2_analysis.h" +#include "ui/gtk/rtp_stream.h" +#include "ui/gtk/rtp_stream_dlg.h" +#include "ui/gtk/utf8_entities.h" + +#include "ui/gtk/old-gtk-compat.h" enum { diff --git a/gtk/iax2_analysis.h b/ui/gtk/iax2_analysis.h index cdc1a510e3..cdc1a510e3 100644 --- a/gtk/iax2_analysis.h +++ b/ui/gtk/iax2_analysis.h diff --git a/gtk/io_stat.c b/ui/gtk/io_stat.c index 971192c9d5..a19e1f75d6 100644 --- a/gtk/io_stat.c +++ b/ui/gtk/io_stat.c @@ -48,18 +48,18 @@ #include "../alert_box.h" #include "../simple_dialog.h" -#include "gtk/gtkglobals.h" -#include "gtk/gui_utils.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/stock_icons.h" -#include "gtk/dlg_utils.h" -#include "gtk/filter_dlg.h" -#include "gtk/help_dlg.h" -#include "gtk/pixmap_save.h" -#include "gtk/main.h" -#include "gtk/filter_autocomplete.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/pixmap_save.h" +#include "ui/gtk/main.h" +#include "ui/gtk/filter_autocomplete.h" + +#include "ui/gtk/old-gtk-compat.h" #define MAX_GRAPHS 5 diff --git a/gtk/keys.h b/ui/gtk/keys.h index 13dc6ccd49..13dc6ccd49 100644 --- a/gtk/keys.h +++ b/ui/gtk/keys.h diff --git a/gtk/ldap_stat.c b/ui/gtk/ldap_stat.c index 7d628a3fbc..ce24391b22 100644 --- a/gtk/ldap_stat.c +++ b/ui/gtk/ldap_stat.c @@ -45,14 +45,14 @@ #include "../file.h" #include "../stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/service_response_time_table.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gtkglobals.h" -#include "gtk/main.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/service_response_time_table.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/main.h" + +#include "ui/gtk/old-gtk-compat.h" /* used to keep track of the statistics for an entire program interface */ typedef struct _ldapstat_t { diff --git a/gtk/libui.vcproj b/ui/gtk/libui.vcproj index c26e3fb2f5..c26e3fb2f5 100644 --- a/gtk/libui.vcproj +++ b/ui/gtk/libui.vcproj diff --git a/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c index 0487d3be0c..0989132eac 100644 --- a/gtk/mac_lte_stat_dlg.c +++ b/ui/gtk/mac_lte_stat_dlg.c @@ -40,7 +40,7 @@ #include <gtk/gtk.h> -#include "gtk/gtkglobals.h" +#include "ui/gtk/gtkglobals.h" #include <epan/packet.h> #include <epan/packet_info.h> @@ -50,14 +50,14 @@ #include "../simple_dialog.h" #include "../stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/help_dlg.h" -#include "gtk/main.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/main.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" /**********************************************/ /* Table column identifiers and title strings */ diff --git a/gtk/macros_dlg.c b/ui/gtk/macros_dlg.c index d7d42c314d..6b224c3ee0 100644 --- a/gtk/macros_dlg.c +++ b/ui/gtk/macros_dlg.c @@ -32,9 +32,9 @@ #include <epan/uat-int.h> #include "globals.h" -#include "gtk/uat_gui.h" -#include "gtk/macros_dlg.h" -#include "gtk/gtkglobals.h" +#include "ui/gtk/uat_gui.h" +#include "ui/gtk/macros_dlg.h" +#include "ui/gtk/gtkglobals.h" void macros_post_update(void) { g_free (cfile.dfilter); diff --git a/gtk/macros_dlg.h b/ui/gtk/macros_dlg.h index 73e1104221..73e1104221 100644 --- a/gtk/macros_dlg.h +++ b/ui/gtk/macros_dlg.h diff --git a/gtk/main.c b/ui/gtk/main.c index 9a7e970773..7d433bce5e 100644 --- a/gtk/main.c +++ b/ui/gtk/main.c @@ -126,45 +126,45 @@ #endif /* _WIN32 */ /* GTK related */ -#include "gtk/file_dlg.h" -#include "gtk/gtkglobals.h" -#include "gtk/color_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/color_dlg.h" -#include "gtk/filter_dlg.h" -#include "gtk/uat_gui.h" -#include "gtk/main.h" -#include "gtk/main_airpcap_toolbar.h" -#include "gtk/main_filter_toolbar.h" -#include "gtk/menus.h" -#include "gtk/macros_dlg.h" -#include "gtk/main_statusbar_private.h" -#include "gtk/main_toolbar.h" -#include "gtk/main_welcome.h" -#include "gtk/drag_and_drop.h" -#include "gtk/capture_file_dlg.h" -#include "gtk/main_proto_draw.h" -#include "gtk/keys.h" -#include "gtk/packet_win.h" -#include "gtk/stock_icons.h" -#include "gtk/find_dlg.h" -#include "gtk/recent.h" -#include "gtk/follow_tcp.h" -#include "gtk/font_utils.h" -#include "gtk/about_dlg.h" -#include "gtk/help_dlg.h" -#include "gtk/decode_as_dlg.h" -#include "gtk/webbrowser.h" -#include "gtk/capture_dlg.h" -#include "gtk/capture_if_dlg.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/prefs_column.h" -#include "gtk/prefs_dlg.h" -#include "gtk/proto_help.h" -#include "gtk/new_packet_list.h" -#include "gtk/filter_expression_save_dlg.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/color_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/color_dlg.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/uat_gui.h" +#include "ui/gtk/main.h" +#include "ui/gtk/main_airpcap_toolbar.h" +#include "ui/gtk/main_filter_toolbar.h" +#include "ui/gtk/menus.h" +#include "ui/gtk/macros_dlg.h" +#include "ui/gtk/main_statusbar_private.h" +#include "ui/gtk/main_toolbar.h" +#include "ui/gtk/main_welcome.h" +#include "ui/gtk/drag_and_drop.h" +#include "ui/gtk/capture_file_dlg.h" +#include "ui/gtk/main_proto_draw.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/packet_win.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/find_dlg.h" +#include "ui/gtk/recent.h" +#include "ui/gtk/follow_tcp.h" +#include "ui/gtk/font_utils.h" +#include "ui/gtk/about_dlg.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/decode_as_dlg.h" +#include "ui/gtk/webbrowser.h" +#include "ui/gtk/capture_dlg.h" +#include "ui/gtk/capture_if_dlg.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/prefs_column.h" +#include "ui/gtk/prefs_dlg.h" +#include "ui/gtk/proto_help.h" +#include "ui/gtk/new_packet_list.h" +#include "ui/gtk/filter_expression_save_dlg.h" + +#include "ui/gtk/old-gtk-compat.h" #ifdef HAVE_LIBPCAP #include "../image/wsicon16.xpm" diff --git a/gtk/main.h b/ui/gtk/main.h index f944ab2bb6..f944ab2bb6 100644 --- a/gtk/main.h +++ b/ui/gtk/main.h diff --git a/gtk/main_airpcap_toolbar.c b/ui/gtk/main_airpcap_toolbar.c index ee41a88a1d..fb016d6b10 100644 --- a/gtk/main_airpcap_toolbar.c +++ b/ui/gtk/main_airpcap_toolbar.c @@ -33,7 +33,7 @@ #ifdef HAVE_AIRPCAP #include <gtk/gtk.h> -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" #include <epan/epan.h> #include <epan/frequency-utils.h> diff --git a/gtk/main_airpcap_toolbar.h b/ui/gtk/main_airpcap_toolbar.h index 80ccbed85d..80ccbed85d 100644 --- a/gtk/main_airpcap_toolbar.h +++ b/ui/gtk/main_airpcap_toolbar.h diff --git a/gtk/main_filter_toolbar.c b/ui/gtk/main_filter_toolbar.c index 63d23324fc..43054bdf71 100644 --- a/gtk/main_filter_toolbar.c +++ b/ui/gtk/main_filter_toolbar.c @@ -34,7 +34,7 @@ #include <string.h> #include <gtk/gtk.h> -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" #include "filter_dlg.h" #include "filter_autocomplete.h" diff --git a/gtk/main_filter_toolbar.h b/ui/gtk/main_filter_toolbar.h index e90b6d2271..e90b6d2271 100644 --- a/gtk/main_filter_toolbar.h +++ b/ui/gtk/main_filter_toolbar.h diff --git a/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 55224ea36b..e10072f966 100644 --- a/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -54,62 +54,62 @@ #include "../stat_menu.h" #include "../u3.h" -#include "gtk/about_dlg.h" -#include "gtk/capture_dlg.h" -#include "gtk/capture_if_dlg.h" -#include "gtk/color_dlg.h" -#include "gtk/filter_dlg.h" -#include "gtk/profile_dlg.h" -#include "gtk/dlg_utils.h" -#include "gtk/capture_file_dlg.h" -#include "gtk/fileset_dlg.h" -#include "gtk/file_import_dlg.h" -#include "gtk/find_dlg.h" -#include "gtk/goto_dlg.h" -#include "gtk/summary_dlg.h" -#include "gtk/prefs_dlg.h" -#include "gtk/packet_win.h" -#include "gtk/follow_tcp.h" -#include "gtk/follow_udp.h" -#include "gtk/follow_ssl.h" -#include "gtk/decode_as_dlg.h" -#include "gtk/help_dlg.h" -#include "gtk/supported_protos_dlg.h" -#include "gtk/proto_dlg.h" -#include "gtk/proto_hier_stats_dlg.h" -#include "gtk/keys.h" -#include "gtk/stock_icons.h" -#include "gtk/gtkglobals.h" -#include "gtk/recent.h" -#include "gtk/main_proto_draw.h" -#include "gtk/conversations_table.h" -#include "gtk/hostlist_table.h" -#include "gtk/packet_history.h" -#include "gtk/sctp_stat.h" -#include "gtk/firewall_dlg.h" -#include "gtk/macros_dlg.h" -#include "gtk/export_object.h" +#include "ui/gtk/about_dlg.h" +#include "ui/gtk/capture_dlg.h" +#include "ui/gtk/capture_if_dlg.h" +#include "ui/gtk/color_dlg.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/profile_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/capture_file_dlg.h" +#include "ui/gtk/fileset_dlg.h" +#include "ui/gtk/file_import_dlg.h" +#include "ui/gtk/find_dlg.h" +#include "ui/gtk/goto_dlg.h" +#include "ui/gtk/summary_dlg.h" +#include "ui/gtk/prefs_dlg.h" +#include "ui/gtk/packet_win.h" +#include "ui/gtk/follow_tcp.h" +#include "ui/gtk/follow_udp.h" +#include "ui/gtk/follow_ssl.h" +#include "ui/gtk/decode_as_dlg.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/supported_protos_dlg.h" +#include "ui/gtk/proto_dlg.h" +#include "ui/gtk/proto_hier_stats_dlg.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/recent.h" +#include "ui/gtk/main_proto_draw.h" +#include "ui/gtk/conversations_table.h" +#include "ui/gtk/hostlist_table.h" +#include "ui/gtk/packet_history.h" +#include "ui/gtk/sctp_stat.h" +#include "ui/gtk/firewall_dlg.h" +#include "ui/gtk/macros_dlg.h" +#include "ui/gtk/export_object.h" #include "epan/dissectors/packet-ssl-utils.h" -#include "gtk/export_sslkeys.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/main.h" -#include "gtk/menus.h" -#include "gtk/main_toolbar.h" -#include "gtk/main_welcome.h" -#include "gtk/uat_gui.h" -#include "gtk/gui_utils.h" -#include "gtk/manual_addr_resolv.h" -#include "gtk/proto_help.h" -#include "gtk/dissector_tables_dlg.h" -#include "gtk/utf8_entities.h" -#include "gtk/expert_comp_dlg.h" -#include "gtk/time_shift_dlg.h" - -#include "gtk/new_packet_list.h" +#include "ui/gtk/export_sslkeys.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/main.h" +#include "ui/gtk/menus.h" +#include "ui/gtk/main_toolbar.h" +#include "ui/gtk/main_welcome.h" +#include "ui/gtk/uat_gui.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/manual_addr_resolv.h" +#include "ui/gtk/proto_help.h" +#include "ui/gtk/dissector_tables_dlg.h" +#include "ui/gtk/utf8_entities.h" +#include "ui/gtk/expert_comp_dlg.h" +#include "ui/gtk/time_shift_dlg.h" + +#include "ui/gtk/new_packet_list.h" #ifdef HAVE_LIBPCAP #include "capture_opts.h" -#include "gtk/capture_globals.h" +#include "ui/gtk/capture_globals.h" #endif #ifdef HAVE_IGE_MAC_INTEGRATION #include <ige-mac-menu.h> @@ -170,7 +170,7 @@ get_ui_file_path(const char *filename) gchar *gui_desc_file_name; gui_desc_file_name = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s" G_DIR_SEPARATOR_S "%s", get_datafile_dir(), - running_in_build_directory() ? "gtk/ui" : "ui", filename); + running_in_build_directory() ? "ui/gtk/ui" : "ui", filename); return gui_desc_file_name; } #endif diff --git a/gtk/main_proto_draw.c b/ui/gtk/main_proto_draw.c index 3df1ee7c59..d431b941ac 100644 --- a/gtk/main_proto_draw.c +++ b/ui/gtk/main_proto_draw.c @@ -61,19 +61,19 @@ #include "../ui_util.h" #include <wsutil/file_util.h> -#include "gtk/keys.h" -#include "gtk/color_utils.h" -#include "gtk/capture_file_dlg.h" -#include "gtk/packet_win.h" -#include "gtk/file_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/gtkglobals.h" -#include "gtk/font_utils.h" -#include "gtk/webbrowser.h" -#include "gtk/main.h" -#include "gtk/menus.h" -#include "gtk/main_proto_draw.h" -#include "gtk/recent.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/color_utils.h" +#include "ui/gtk/capture_file_dlg.h" +#include "ui/gtk/packet_win.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/font_utils.h" +#include "ui/gtk/webbrowser.h" +#include "ui/gtk/main.h" +#include "ui/gtk/menus.h" +#include "ui/gtk/main_proto_draw.h" +#include "ui/gtk/recent.h" #ifdef _WIN32 #include <gdk/gdkwin32.h> diff --git a/gtk/main_proto_draw.h b/ui/gtk/main_proto_draw.h index a4699f718c..a4699f718c 100644 --- a/gtk/main_proto_draw.h +++ b/ui/gtk/main_proto_draw.h diff --git a/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c index 3f4d82a6e5..a52abfd69d 100644 --- a/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -46,17 +46,17 @@ #include "../capture.h" #endif -#include "gtk/recent.h" -#include "gtk/main.h" -#include "gtk/main_statusbar_private.h" -#include "gtk/gui_utils.h" -#include "gtk/gtkglobals.h" -#include "gtk/expert_comp_dlg.h" -#include "gtk/profile_dlg.h" -#include "gtk/main_welcome.h" -#include "gtk/expert_indicators.h" -#include "gtk/keys.h" -#include "gtk/menus.h" +#include "ui/gtk/recent.h" +#include "ui/gtk/main.h" +#include "ui/gtk/main_statusbar_private.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/expert_comp_dlg.h" +#include "ui/gtk/profile_dlg.h" +#include "ui/gtk/main_welcome.h" +#include "ui/gtk/expert_indicators.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/menus.h" #include "main_statusbar.h" diff --git a/gtk/main_statusbar_private.h b/ui/gtk/main_statusbar_private.h index 5467aac73c..5467aac73c 100644 --- a/gtk/main_statusbar_private.h +++ b/ui/gtk/main_statusbar_private.h diff --git a/gtk/main_toolbar.c b/ui/gtk/main_toolbar.c index 9e98331909..1a0616a72d 100644 --- a/gtk/main_toolbar.c +++ b/ui/gtk/main_toolbar.c @@ -39,27 +39,27 @@ #include "../color_filters.h" #ifdef HAVE_LIBPCAP -#include "gtk/capture_dlg.h" -#include "gtk/capture_if_dlg.h" +#include "ui/gtk/capture_dlg.h" +#include "ui/gtk/capture_if_dlg.h" #endif /* HAVE_LIBPCAP */ -#include "gtk/filter_dlg.h" -#include "gtk/capture_file_dlg.h" -#include "gtk/find_dlg.h" -#include "gtk/goto_dlg.h" -#include "gtk/color_dlg.h" -#include "gtk/prefs_dlg.h" -#include "gtk/main.h" -#include "gtk/menus.h" -#include "gtk/main_toolbar.h" -#include "gtk/help_dlg.h" -#include "gtk/gtkglobals.h" -#include "gtk/stock_icons.h" -#include "gtk/keys.h" -#include "gtk/recent.h" -#include "gtk/packet_history.h" -#include "gtk/new_packet_list.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/capture_file_dlg.h" +#include "ui/gtk/find_dlg.h" +#include "ui/gtk/goto_dlg.h" +#include "ui/gtk/color_dlg.h" +#include "ui/gtk/prefs_dlg.h" +#include "ui/gtk/main.h" +#include "ui/gtk/menus.h" +#include "ui/gtk/main_toolbar.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/recent.h" +#include "ui/gtk/packet_history.h" +#include "ui/gtk/new_packet_list.h" + +#include "ui/gtk/old-gtk-compat.h" static gboolean toolbar_init = FALSE; diff --git a/gtk/main_toolbar.h b/ui/gtk/main_toolbar.h index 6c040f9660..6c040f9660 100644 --- a/gtk/main_toolbar.h +++ b/ui/gtk/main_toolbar.h diff --git a/gtk/main_welcome.c b/ui/gtk/main_welcome.c index 9625c55105..31f1202751 100644 --- a/gtk/main_welcome.c +++ b/ui/gtk/main_welcome.c @@ -44,23 +44,23 @@ #include "simple_dialog.h" #include <wsutil/file_util.h> -#include "gtk/gui_utils.h" -#include "gtk/color_utils.h" -#include "gtk/recent.h" -#include "gtk/gtkglobals.h" -#include "gtk/main.h" -#include "gtk/menus.h" -#include "gtk/main_welcome.h" -#include "gtk/help_dlg.h" -#include "gtk/capture_file_dlg.h" -#include "gtk/stock_icons.h" -#include "gtk/utf8_entities.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/color_utils.h" +#include "ui/gtk/recent.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/main.h" +#include "ui/gtk/menus.h" +#include "ui/gtk/main_welcome.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/capture_file_dlg.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/utf8_entities.h" #ifdef HAVE_LIBPCAP -#include "gtk/capture_dlg.h" -#include "gtk/capture_if_dlg.h" -#include "gtk/capture_globals.h" +#include "ui/gtk/capture_dlg.h" +#include "ui/gtk/capture_if_dlg.h" +#include "ui/gtk/capture_globals.h" #if GTK_CHECK_VERSION(2,18,0) -#include "gtk/webbrowser.h" +#include "ui/gtk/webbrowser.h" #endif #endif /* HAVE_LIBPCAP */ #include "../image/wssplash-dev.xpm" @@ -80,7 +80,7 @@ #include "../image/toolbar/capture_airpcap_16.xpm" #endif #if defined(HAVE_PCAP_REMOTE) -#include "gtk/remote_icons.h" +#include "ui/gtk/remote_icons.h" #endif /* XXX */ diff --git a/gtk/main_welcome.h b/ui/gtk/main_welcome.h index 566f7669e2..23996e3723 100644 --- a/gtk/main_welcome.h +++ b/ui/gtk/main_welcome.h @@ -25,7 +25,7 @@ #ifndef __MAIN_WELCOME_H__ #define __MAIN_WELCOME_H__ -#include "gtk/capture_dlg.h" +#include "ui/gtk/capture_dlg.h" enum { diff --git a/gtk/manual_addr_resolv.c b/ui/gtk/manual_addr_resolv.c index ca9ce892af..9ac030fe3b 100644 --- a/gtk/manual_addr_resolv.c +++ b/ui/gtk/manual_addr_resolv.c @@ -37,13 +37,13 @@ #include "epan/addr_resolv.h" #include "../simple_dialog.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/help_dlg.h" -#include "gtk/main.h" -#include "gtk/menus.h" -#include "gtk/manual_addr_resolv.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/main.h" +#include "ui/gtk/menus.h" +#include "ui/gtk/manual_addr_resolv.h" +#include "ui/gtk/old-gtk-compat.h" GtkWidget *man_addr_resolv_dlg = NULL; diff --git a/gtk/manual_addr_resolv.h b/ui/gtk/manual_addr_resolv.h index 5d27201299..5d27201299 100644 --- a/gtk/manual_addr_resolv.h +++ b/ui/gtk/manual_addr_resolv.h diff --git a/gtk/mcast_stream.c b/ui/gtk/mcast_stream.c index efb7bea44a..8a562e7959 100644 --- a/gtk/mcast_stream.c +++ b/ui/gtk/mcast_stream.c @@ -57,9 +57,9 @@ #include "../alert_box.h" #include "../simple_dialog.h" -#include "gtk/mcast_stream.h" -#include "gtk/mcast_stream_dlg.h" -#include "gtk/main.h" +#include "ui/gtk/mcast_stream.h" +#include "ui/gtk/mcast_stream_dlg.h" +#include "ui/gtk/main.h" #ifdef HAVE_WINSOCK2_H #include <winsock2.h> diff --git a/gtk/mcast_stream.h b/ui/gtk/mcast_stream.h index 0cf3d101a7..0cf3d101a7 100644 --- a/gtk/mcast_stream.h +++ b/ui/gtk/mcast_stream.h diff --git a/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c index b01b33b4ff..b746cdf1ee 100644 --- a/gtk/mcast_stream_dlg.c +++ b/ui/gtk/mcast_stream_dlg.c @@ -36,7 +36,7 @@ #include <string.h> #include <locale.h> -#include "gtk/gtk.h" +#include <gtk/gtk.h> #include "epan/filesystem.h" #include <epan/address.h> @@ -47,12 +47,12 @@ #include "../stat_menu.h" #include "../simple_dialog.h" -#include "gtk/mcast_stream_dlg.h" -#include "gtk/mcast_stream.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/gtkglobals.h" +#include "ui/gtk/mcast_stream_dlg.h" +#include "ui/gtk/mcast_stream.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/gtkglobals.h" /* Capture callback data keys */ #define E_MCAST_ENTRY_1 "burst_interval" diff --git a/gtk/mcast_stream_dlg.h b/ui/gtk/mcast_stream_dlg.h index fca233f108..fca233f108 100644 --- a/gtk/mcast_stream_dlg.h +++ b/ui/gtk/mcast_stream_dlg.h diff --git a/gtk/megaco_stat.c b/ui/gtk/megaco_stat.c index 38b7120e5d..b05159b7d1 100644 --- a/gtk/megaco_stat.c +++ b/ui/gtk/megaco_stat.c @@ -49,15 +49,15 @@ #include "../file.h" #include "../stat_menu.h" -#include "gtk/gui_stat_util.h" -#include "gtk/dlg_utils.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/main.h" +#include "ui/gtk/gui_stat_util.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/main.h" #include "tap-megaco-common.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" static void megacostat_reset(void *pms) diff --git a/gtk/menus.h b/ui/gtk/menus.h index 845cf69d7b..845cf69d7b 100644 --- a/gtk/menus.h +++ b/ui/gtk/menus.h diff --git a/gtk/mgcp_stat.c b/ui/gtk/mgcp_stat.c index 9643c47b6c..aa1834af06 100644 --- a/gtk/mgcp_stat.c +++ b/ui/gtk/mgcp_stat.c @@ -46,13 +46,13 @@ #include "../file.h" #include "../stat_menu.h" -#include "gtk/gui_stat_util.h" -#include "gtk/dlg_utils.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/main.h" +#include "ui/gtk/gui_stat_util.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/main.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" #define NUM_TIMESTATS 10 diff --git a/gtk/mtp3_stat.c b/ui/gtk/mtp3_stat.c index 438d365d36..ddd1a8aa2e 100644 --- a/gtk/mtp3_stat.c +++ b/ui/gtk/mtp3_stat.c @@ -48,13 +48,13 @@ #include "../stat_menu.h" #include "../simple_dialog.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/filter_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/mtp3_stat.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/mtp3_stat.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" enum { diff --git a/gtk/mtp3_stat.h b/ui/gtk/mtp3_stat.h index 4aedd65b54..4aedd65b54 100644 --- a/gtk/mtp3_stat.h +++ b/ui/gtk/mtp3_stat.h diff --git a/gtk/mtp3_summary.c b/ui/gtk/mtp3_summary.c index 0bf9c95fb3..6afa783296 100644 --- a/gtk/mtp3_summary.c +++ b/ui/gtk/mtp3_summary.c @@ -49,10 +49,10 @@ #include "../file.h" #include "../summary.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/mtp3_stat.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/mtp3_stat.h" #define SUM_STR_MAX 1024 diff --git a/gtk/ncp_stat.c b/ui/gtk/ncp_stat.c index 3bddc62d3d..c83d3d0d9c 100644 --- a/gtk/ncp_stat.c +++ b/ui/gtk/ncp_stat.c @@ -45,12 +45,12 @@ #include "../file.h" #include "../stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/service_response_time_table.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gtkglobals.h" -#include "gtk/main.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/service_response_time_table.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/main.h" /* used to keep track of the statistics for an entire program interface */ diff --git a/gtk/network_icons.h b/ui/gtk/network_icons.h index 1f430e683d..1f430e683d 100644 --- a/gtk/network_icons.h +++ b/ui/gtk/network_icons.h diff --git a/gtk/new_packet_list.c b/ui/gtk/new_packet_list.c index 39204fa6ee..d8df054b10 100644 --- a/gtk/new_packet_list.c +++ b/ui/gtk/new_packet_list.c @@ -37,7 +37,7 @@ #include "gui_utils.h" #include "packet_list_store.h" -#include "gtk/new_packet_list.h" +#include "ui/gtk/new_packet_list.h" #include "epan/column_info.h" #include "epan/prefs.h" #include <epan/packet.h> @@ -48,27 +48,27 @@ #include "../main_statusbar.h" #include "epan/emem.h" #include "globals.h" -#include "gtk/gtkglobals.h" -#include "gtk/font_utils.h" -#include "gtk/packet_history.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/font_utils.h" +#include "ui/gtk/packet_history.h" #include "epan/column.h" #include "epan/strutil.h" -#include "gtk/recent.h" -#include "gtk/keys.h" -#include "gtk/menus.h" +#include "ui/gtk/recent.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/menus.h" #include "color.h" #include "color_filters.h" -#include "gtk/color_utils.h" -#include "gtk/capture_file_dlg.h" -#include "gtk/packet_win.h" -#include "gtk/main.h" -#include "gtk/prefs_column.h" -#include "gtk/prefs_dlg.h" -#include "gtk/dlg_utils.h" -#include "gtk/filter_dlg.h" -#include "gtk/filter_autocomplete.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/color_utils.h" +#include "ui/gtk/capture_file_dlg.h" +#include "ui/gtk/packet_win.h" +#include "ui/gtk/main.h" +#include "ui/gtk/prefs_column.h" +#include "ui/gtk/prefs_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/filter_autocomplete.h" + +#include "ui/gtk/old-gtk-compat.h" #define COLUMN_WIDTH_MIN 40 diff --git a/gtk/new_packet_list.h b/ui/gtk/new_packet_list.h index b25bdf76f9..b25bdf76f9 100644 --- a/gtk/new_packet_list.h +++ b/ui/gtk/new_packet_list.h diff --git a/gtk/old-gtk-compat.h b/ui/gtk/old-gtk-compat.h index a3824d5414..a3824d5414 100644 --- a/gtk/old-gtk-compat.h +++ b/ui/gtk/old-gtk-compat.h diff --git a/gtk/packet_history.c b/ui/gtk/packet_history.c index 06e60b1c0f..5951da3b02 100644 --- a/gtk/packet_history.c +++ b/ui/gtk/packet_history.c @@ -33,8 +33,8 @@ #include "../file.h" #include "../globals.h" -#include "gtk/menus.h" -#include "gtk/packet_history.h" +#include "ui/gtk/menus.h" +#include "ui/gtk/packet_history.h" static GList *history_current = NULL; diff --git a/gtk/packet_history.h b/ui/gtk/packet_history.h index 76469e41b9..76469e41b9 100644 --- a/gtk/packet_history.h +++ b/ui/gtk/packet_history.h diff --git a/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c index 989a3ff7e1..989a3ff7e1 100644 --- a/gtk/packet_list_store.c +++ b/ui/gtk/packet_list_store.c diff --git a/gtk/packet_list_store.h b/ui/gtk/packet_list_store.h index 34ce0dfa94..34ce0dfa94 100644 --- a/gtk/packet_list_store.h +++ b/ui/gtk/packet_list_store.h diff --git a/gtk/packet_win.c b/ui/gtk/packet_win.c index 681cb3f576..44e504e339 100644 --- a/gtk/packet_win.c +++ b/ui/gtk/packet_win.c @@ -64,14 +64,14 @@ #include "../summary.h" #include "../simple_dialog.h" -#include "gtk/font_utils.h" -#include "gtk/main.h" -#include "gtk/packet_win.h" -#include "gtk/main_proto_draw.h" -#include "gtk/keys.h" -#include "gtk/gtkglobals.h" -#include "gtk/gui_utils.h" -#include "gtk/recent.h" +#include "ui/gtk/font_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/packet_win.h" +#include "ui/gtk/main_proto_draw.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/recent.h" #define BV_SIZE 75 #define TV_SIZE 95 diff --git a/gtk/packet_win.h b/ui/gtk/packet_win.h index 1f4f0f5a88..1f4f0f5a88 100644 --- a/gtk/packet_win.h +++ b/ui/gtk/packet_win.h diff --git a/gtk/pixmap_save.c b/ui/gtk/pixmap_save.c index 3491c6beb9..49d17df033 100644 --- a/gtk/pixmap_save.c +++ b/ui/gtk/pixmap_save.c @@ -35,14 +35,14 @@ #include "../simple_dialog.h" -#include "gtk/pixmap_save.h" -#include "gtk/gui_utils.h" -#include "gtk/file_dlg.h" +#include "ui/gtk/pixmap_save.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/file_dlg.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" #if GTK_CHECK_VERSION(2,22,0) #if !GTK_CHECK_VERSION(3,0,0) -#include "gtk/gui_utils.h" +#include "ui/gtk/gui_utils.h" #endif #endif static GtkWidget *save_as_w; diff --git a/gtk/pixmap_save.h b/ui/gtk/pixmap_save.h index ec92f4f984..ec92f4f984 100644 --- a/gtk/pixmap_save.h +++ b/ui/gtk/pixmap_save.h diff --git a/gtk/plugins_dlg.c b/ui/gtk/plugins_dlg.c index 015ab57fa5..543cc5f5b9 100644 --- a/gtk/plugins_dlg.c +++ b/ui/gtk/plugins_dlg.c @@ -30,9 +30,9 @@ #include "epan/plugins.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/plugins_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/plugins_dlg.h" #if defined(HAVE_PLUGINS) || defined(HAVE_LUA_5_1) diff --git a/gtk/plugins_dlg.h b/ui/gtk/plugins_dlg.h index 652393e0ff..652393e0ff 100644 --- a/gtk/plugins_dlg.h +++ b/ui/gtk/plugins_dlg.h diff --git a/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c index c82d0414b0..a5a5bbd44d 100644 --- a/gtk/prefs_capture.c +++ b/ui/gtk/prefs_capture.c @@ -37,15 +37,15 @@ #include "../capture_ifinfo.h" #include "../capture_ui_utils.h" -#include "gtk/prefs_capture.h" -#include "gtk/prefs_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/main.h" -#include "gtk/main_welcome.h" -#include "gtk/help_dlg.h" -#include "gtk/stock_icons.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/prefs_capture.h" +#include "ui/gtk/prefs_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/main_welcome.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/old-gtk-compat.h" #include <epan/strutil.h> diff --git a/gtk/prefs_capture.h b/ui/gtk/prefs_capture.h index 7f19e4d5da..7f19e4d5da 100644 --- a/gtk/prefs_capture.h +++ b/ui/gtk/prefs_capture.h diff --git a/gtk/prefs_column.c b/ui/gtk/prefs_column.c index 3814229bee..1e919564c5 100644 --- a/gtk/prefs_column.c +++ b/ui/gtk/prefs_column.c @@ -37,13 +37,13 @@ #include "../globals.h" -#include "gtk/prefs_column.h" -#include "gtk/gtkglobals.h" -#include "gtk/gui_utils.h" -#include "gtk/new_packet_list.h" -#include "gtk/filter_dlg.h" -#include "gtk/filter_autocomplete.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/prefs_column.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/new_packet_list.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/filter_autocomplete.h" +#include "ui/gtk/old-gtk-compat.h" static GtkWidget *remove_bt, *field_te, *field_lb, *occurrence_te, *occurrence_lb, *fmt_cmb; static gulong column_menu_changed_handler_id; diff --git a/gtk/prefs_column.h b/ui/gtk/prefs_column.h index 5e8cc0cb32..5e8cc0cb32 100644 --- a/gtk/prefs_column.h +++ b/ui/gtk/prefs_column.h diff --git a/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c index 9c71d18cef..e519456b57 100644 --- a/gtk/prefs_dlg.c +++ b/ui/gtk/prefs_dlg.c @@ -40,25 +40,25 @@ #include "../print.h" #include "../simple_dialog.h" -#include "gtk/main.h" -#include "gtk/prefs_column.h" -#include "gtk/prefs_dlg.h" -#include "gtk/prefs_filter_expressions.h" -#include "gtk/prefs_print.h" -#include "gtk/prefs_stream.h" -#include "gtk/prefs_gui.h" -#include "gtk/prefs_layout.h" -#include "gtk/prefs_capture.h" -#include "gtk/prefs_nameres.h" -#include "gtk/prefs_taps.h" -#include "gtk/prefs_protocols.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/stock_icons.h" -#include "gtk/help_dlg.h" -#include "gtk/keys.h" -#include "gtk/uat_gui.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/main.h" +#include "ui/gtk/prefs_column.h" +#include "ui/gtk/prefs_dlg.h" +#include "ui/gtk/prefs_filter_expressions.h" +#include "ui/gtk/prefs_print.h" +#include "ui/gtk/prefs_stream.h" +#include "ui/gtk/prefs_gui.h" +#include "ui/gtk/prefs_layout.h" +#include "ui/gtk/prefs_capture.h" +#include "ui/gtk/prefs_nameres.h" +#include "ui/gtk/prefs_taps.h" +#include "ui/gtk/prefs_protocols.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/uat_gui.h" +#include "ui/gtk/old-gtk-compat.h" #ifdef HAVE_LIBPCAP #ifdef _WIN32 diff --git a/gtk/prefs_dlg.h b/ui/gtk/prefs_dlg.h index ccce7784f5..ccce7784f5 100644 --- a/gtk/prefs_dlg.h +++ b/ui/gtk/prefs_dlg.h diff --git a/gtk/prefs_filter_expressions.c b/ui/gtk/prefs_filter_expressions.c index c3d13fd459..91af3664bd 100644 --- a/gtk/prefs_filter_expressions.c +++ b/ui/gtk/prefs_filter_expressions.c @@ -38,13 +38,13 @@ #include "../globals.h" -#include "gtk/gtkglobals.h" -#include "gtk/gui_utils.h" -#include "gtk/new_packet_list.h" -#include "gtk/filter_dlg.h" -#include "gtk/filter_autocomplete.h" -#include "gtk/filter_expression_save_dlg.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/new_packet_list.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/filter_autocomplete.h" +#include "ui/gtk/filter_expression_save_dlg.h" +#include "ui/gtk/old-gtk-compat.h" static void filter_expressions_list_new_cb(GtkWidget *, gpointer); static void filter_expressions_list_remove_cb(GtkWidget *, gpointer); diff --git a/gtk/prefs_filter_expressions.h b/ui/gtk/prefs_filter_expressions.h index 6db77da9f8..6db77da9f8 100644 --- a/gtk/prefs_filter_expressions.h +++ b/ui/gtk/prefs_filter_expressions.h diff --git a/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c index 9cf675bc54..fd3ab2fc5d 100644 --- a/gtk/prefs_gui.c +++ b/ui/gtk/prefs_gui.c @@ -33,21 +33,21 @@ #include "../simple_dialog.h" -#include "gtk/prefs_gui.h" -#include "gtk/gtkglobals.h" -#include "gtk/help_dlg.h" -#include "gtk/supported_protos_dlg.h" -#include "gtk/prefs_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/main.h" -#include "gtk/new_packet_list.h" -#include "gtk/main_proto_draw.h" -#include "gtk/main_toolbar.h" -#include "gtk/font_utils.h" -#include "gtk/recent.h" -#include "gtk/webbrowser.h" -#include "gtk/main_welcome.h" +#include "ui/gtk/prefs_gui.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/supported_protos_dlg.h" +#include "ui/gtk/prefs_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/new_packet_list.h" +#include "ui/gtk/main_proto_draw.h" +#include "ui/gtk/main_toolbar.h" +#include "ui/gtk/font_utils.h" +#include "ui/gtk/recent.h" +#include "ui/gtk/webbrowser.h" +#include "ui/gtk/main_welcome.h" static gint fetch_enum_value(gpointer control, const enum_val_t *enumvals); diff --git a/gtk/prefs_gui.h b/ui/gtk/prefs_gui.h index f337ede8f2..f337ede8f2 100644 --- a/gtk/prefs_gui.h +++ b/ui/gtk/prefs_gui.h diff --git a/gtk/prefs_layout.c b/ui/gtk/prefs_layout.c index be2aca76a8..3de6d4b408 100644 --- a/gtk/prefs_layout.c +++ b/ui/gtk/prefs_layout.c @@ -32,12 +32,12 @@ #include "../ui_util.h" -#include "gtk/prefs_layout.h" -#include "gtk/gtkglobals.h" -#include "gtk/prefs_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/main.h" -#include "gtk/dlg_utils.h" +#include "ui/gtk/prefs_layout.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/prefs_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/dlg_utils.h" #include "../image/icon_layout_1.xpm" #include "../image/icon_layout_2.xpm" diff --git a/gtk/prefs_layout.h b/ui/gtk/prefs_layout.h index 427b1be591..427b1be591 100644 --- a/gtk/prefs_layout.h +++ b/ui/gtk/prefs_layout.h diff --git a/gtk/prefs_nameres.c b/ui/gtk/prefs_nameres.c index 003444897d..8869617948 100644 --- a/gtk/prefs_nameres.c +++ b/ui/gtk/prefs_nameres.c @@ -33,12 +33,12 @@ #include <epan/uat.h> #include <epan/oids.h> -#include "gtk/prefs_nameres.h" -#include "gtk/gtkglobals.h" -#include "gtk/prefs_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/main.h" -#include "gtk/menus.h" +#include "ui/gtk/prefs_nameres.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/prefs_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/menus.h" #define M_RESOLVE_KEY "m_resolve" diff --git a/gtk/prefs_nameres.h b/ui/gtk/prefs_nameres.h index b25995fc56..b25995fc56 100644 --- a/gtk/prefs_nameres.h +++ b/ui/gtk/prefs_nameres.h diff --git a/gtk/prefs_print.c b/ui/gtk/prefs_print.c index 2fd8b7522c..b4e701897a 100644 --- a/gtk/prefs_print.c +++ b/ui/gtk/prefs_print.c @@ -34,14 +34,14 @@ #include "../print.h" #include "../util.h" -#include "gtk/prefs_print.h" -#include "gtk/keys.h" -#include "gtk/prefs_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/file_dlg.h" -#include "gtk/capture_file_dlg.h" -#include "gtk/stock_icons.h" -#include "gtk/gtkglobals.h" +#include "ui/gtk/prefs_print.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/prefs_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/capture_file_dlg.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/gtkglobals.h" static void printer_browse_file_cb(GtkWidget *file_bt, GtkWidget *file_te); diff --git a/gtk/prefs_print.h b/ui/gtk/prefs_print.h index d1af4ff953..d1af4ff953 100644 --- a/gtk/prefs_print.h +++ b/ui/gtk/prefs_print.h diff --git a/gtk/prefs_protocols.c b/ui/gtk/prefs_protocols.c index 590ba02e3e..eeb6fcd770 100644 --- a/gtk/prefs_protocols.c +++ b/ui/gtk/prefs_protocols.c @@ -30,8 +30,8 @@ #include <epan/prefs.h> -#include "gtk/prefs_protocols.h" -#include "gtk/prefs_dlg.h" +#include "ui/gtk/prefs_protocols.h" +#include "ui/gtk/prefs_dlg.h" #define PROTOCOLS_SHOW_HIDDEN_KEY "display_hidden_items" #define PROTOCOLS_TABLE_ROWS 1 diff --git a/gtk/prefs_protocols.h b/ui/gtk/prefs_protocols.h index 8856ba2b1a..8856ba2b1a 100644 --- a/gtk/prefs_protocols.h +++ b/ui/gtk/prefs_protocols.h diff --git a/gtk/prefs_stream.c b/ui/gtk/prefs_stream.c index 74f49f2922..7dcd4d3466 100644 --- a/gtk/prefs_stream.c +++ b/ui/gtk/prefs_stream.c @@ -33,11 +33,11 @@ #include "../color.h" #include "../print.h" -#include "gtk/color_utils.h" -#include "gtk/prefs_stream.h" -#include "gtk/keys.h" -#include "gtk/follow_tcp.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/color_utils.h" +#include "ui/gtk/prefs_stream.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/follow_tcp.h" +#include "ui/gtk/old-gtk-compat.h" #define SAMPLE_MARKED_TEXT "Sample marked packet text\n" #define SAMPLE_IGNORED_TEXT "Sample ignored packet text\n" diff --git a/gtk/prefs_stream.h b/ui/gtk/prefs_stream.h index 921d745b80..921d745b80 100644 --- a/gtk/prefs_stream.h +++ b/ui/gtk/prefs_stream.h diff --git a/gtk/prefs_taps.c b/ui/gtk/prefs_taps.c index 348af0bc7b..d3eba4718e 100644 --- a/gtk/prefs_taps.c +++ b/ui/gtk/prefs_taps.c @@ -31,9 +31,9 @@ #include <epan/prefs.h> -#include "gtk/prefs_taps.h" -#include "gtk/prefs_dlg.h" -#include "gtk/main.h" +#include "ui/gtk/prefs_taps.h" +#include "ui/gtk/prefs_dlg.h" +#include "ui/gtk/main.h" #define TAP_UPDATE_INTERVAL_KEY "update_interval" diff --git a/gtk/prefs_taps.h b/ui/gtk/prefs_taps.h index 1876962efb..1876962efb 100644 --- a/gtk/prefs_taps.h +++ b/ui/gtk/prefs_taps.h diff --git a/gtk/print_dlg.c b/ui/gtk/print_dlg.c index 6f95902dbc..63f7c30a39 100644 --- a/gtk/print_dlg.c +++ b/ui/gtk/print_dlg.c @@ -40,16 +40,16 @@ #include "../util.h" #include <wsutil/file_util.h> -#include "gtk/gtkglobals.h" -#include "gtk/keys.h" -#include "gtk/capture_file_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/file_dlg.h" -#include "gtk/main.h" -#include "gtk/stock_icons.h" -#include "gtk/range_utils.h" -#include "gtk/help_dlg.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/capture_file_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/main.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/range_utils.h" +#include "ui/gtk/help_dlg.h" #ifdef _WIN32 #include <gdk/gdkwin32.h> diff --git a/gtk/profile_dlg.c b/ui/gtk/profile_dlg.c index 16d719f5d4..362caa94f0 100644 --- a/gtk/profile_dlg.c +++ b/ui/gtk/profile_dlg.c @@ -41,15 +41,15 @@ #include "../simple_dialog.h" #include <wsutil/file_util.h> -#include "gtk/main.h" -#include "gtk/menus.h" -#include "gtk/profile_dlg.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/gtkglobals.h" -#include "gtk/help_dlg.h" -#include "gtk/recent.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/main.h" +#include "ui/gtk/menus.h" +#include "ui/gtk/profile_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/recent.h" +#include "ui/gtk/old-gtk-compat.h" enum { NAME_COLUMN, GLOBAL_COLUMN, diff --git a/gtk/profile_dlg.h b/ui/gtk/profile_dlg.h index 934e2c4ce7..934e2c4ce7 100644 --- a/gtk/profile_dlg.h +++ b/ui/gtk/profile_dlg.h diff --git a/gtk/progress_dlg.c b/ui/gtk/progress_dlg.c index 1d6ee322bf..1d007eaf24 100644 --- a/gtk/progress_dlg.c +++ b/ui/gtk/progress_dlg.c @@ -32,9 +32,9 @@ #include "../progress_dlg.h" -#include "gtk/gtkglobals.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" #define PROG_BAR_KEY "progress_bar" diff --git a/gtk/proto_dlg.c b/ui/gtk/proto_dlg.c index 4e8d9183d9..4e67e4bdef 100644 --- a/gtk/proto_dlg.c +++ b/ui/gtk/proto_dlg.c @@ -41,11 +41,11 @@ #include "../simple_dialog.h" #include "../disabled_protos.h" -#include "gtk/main.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/proto_dlg.h" -#include "gtk/help_dlg.h" +#include "ui/gtk/main.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/proto_dlg.h" +#include "ui/gtk/help_dlg.h" static gboolean proto_delete_event_cb(GtkWidget *, GdkEvent *, gpointer); diff --git a/gtk/proto_dlg.h b/ui/gtk/proto_dlg.h index add72fa623..add72fa623 100644 --- a/gtk/proto_dlg.h +++ b/ui/gtk/proto_dlg.h diff --git a/gtk/proto_help.c b/ui/gtk/proto_help.c index 127345dd39..80921da670 100644 --- a/gtk/proto_help.c +++ b/ui/gtk/proto_help.c @@ -37,7 +37,7 @@ #include <string.h> #include <gtk/gtk.h> -#include <gtk/webbrowser.h> +#include "ui/gtk/webbrowser.h" #include "../file.h" @@ -46,7 +46,7 @@ #include <epan/strutil.h> #include <epan/proto.h> -#include "gtk/proto_help.h" +#include "ui/gtk/proto_help.h" /* * The protocol help files cannot be downloaded downloaded directly. You diff --git a/gtk/proto_help.h b/ui/gtk/proto_help.h index b2d6b18602..b2d6b18602 100644 --- a/gtk/proto_help.h +++ b/ui/gtk/proto_help.h diff --git a/gtk/proto_hier_stats_dlg.c b/ui/gtk/proto_hier_stats_dlg.c index 8d04a4e53f..21e95790e7 100644 --- a/gtk/proto_hier_stats_dlg.c +++ b/ui/gtk/proto_hier_stats_dlg.c @@ -34,13 +34,13 @@ #include "../proto_hier_stats.h" #include "../simple_dialog.h" -#include "gtk/proto_hier_stats_dlg.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/filter_utils.h" -#include "gtk/gtkglobals.h" -#include "gtk/help_dlg.h" -#include "gtk/utf8_entities.h" +#include "ui/gtk/proto_hier_stats_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/filter_utils.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/utf8_entities.h" enum { diff --git a/gtk/proto_hier_stats_dlg.h b/ui/gtk/proto_hier_stats_dlg.h index 9a8281428b..9a8281428b 100644 --- a/gtk/proto_hier_stats_dlg.h +++ b/ui/gtk/proto_hier_stats_dlg.h diff --git a/gtk/radius_stat.c b/ui/gtk/radius_stat.c index 2e4207a47c..0c07503b4b 100644 --- a/gtk/radius_stat.c +++ b/ui/gtk/radius_stat.c @@ -46,13 +46,13 @@ #include "../file.h" #include "../stat_menu.h" -#include "gtk/gui_stat_util.h" -#include "gtk/dlg_utils.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/main.h" +#include "ui/gtk/gui_stat_util.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/main.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" #define NUM_COLUMNS 11 diff --git a/gtk/range_utils.c b/ui/gtk/range_utils.c index 417af503a7..f32e6061ac 100644 --- a/gtk/range_utils.c +++ b/ui/gtk/range_utils.c @@ -34,9 +34,9 @@ #include "../simple_dialog.h" #include "../packet-range.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/range_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/range_utils.h" #define RANGE_VALUES_KEY "range_values" diff --git a/gtk/range_utils.h b/ui/gtk/range_utils.h index 6842ea199b..6842ea199b 100644 --- a/gtk/range_utils.h +++ b/ui/gtk/range_utils.h diff --git a/gtk/recent.c b/ui/gtk/recent.c index fe9ce289fe..0a891df25d 100644 --- a/gtk/recent.c +++ b/ui/gtk/recent.c @@ -45,17 +45,17 @@ #include "../u3.h" #include <wsutil/file_util.h> -#include "gtk/recent.h" +#include "ui/gtk/recent.h" #ifndef QT_GUI_LIB -#include "gtk/main.h" -#include "gtk/menus.h" -#include "gtk/gui_utils.h" -#include "gtk/new_packet_list.h" -#include "gtk/file_dlg.h" -#include "gtk/cfilter_combo_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/menus.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/new_packet_list.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/cfilter_combo_utils.h" #ifdef HAVE_PCAP_REMOTE -#include "gtk/capture_dlg.h" +#include "ui/gtk/capture_dlg.h" #endif #else /* QT_GUI_LIB */ #include "qt_ui_utils.h" diff --git a/gtk/recent.h b/ui/gtk/recent.h index d582573bbf..d582573bbf 100644 --- a/gtk/recent.h +++ b/ui/gtk/recent.h diff --git a/gtk/remote_icons.h b/ui/gtk/remote_icons.h index 4dc205ae17..4dc205ae17 100644 --- a/gtk/remote_icons.h +++ b/ui/gtk/remote_icons.h diff --git a/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c index a2cf8c8360..fb8b8058c6 100644 --- a/gtk/rlc_lte_stat_dlg.c +++ b/ui/gtk/rlc_lte_stat_dlg.c @@ -39,7 +39,7 @@ #include <gtk/gtk.h> -#include "gtk/gtkglobals.h" +#include "ui/gtk/gtkglobals.h" #include <epan/packet.h> #include <epan/packet_info.h> @@ -49,14 +49,14 @@ #include "../simple_dialog.h" #include "../stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/help_dlg.h" -#include "gtk/main.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/main.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" /**********************************************/ /* Table column identifiers and title strings */ diff --git a/gtk/rpc_progs.c b/ui/gtk/rpc_progs.c index 6608a4118a..b385860b12 100644 --- a/gtk/rpc_progs.c +++ b/ui/gtk/rpc_progs.c @@ -45,12 +45,12 @@ #include "../stat_menu.h" #include "../globals.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/main.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/main.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" #define NANOSECS_PER_SEC 1000000000 diff --git a/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c index 0a04230211..b4b6ddfc9c 100644 --- a/gtk/rpc_stat.c +++ b/ui/gtk/rpc_stat.c @@ -45,17 +45,17 @@ #include "../stat_menu.h" #include "../simple_dialog.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/main.h" -#include "gtk/filter_dlg.h" -#include "gtk/stock_icons.h" -#include "gtk/service_response_time_table.h" -#include "gtk/gtkglobals.h" -#include "gtk/filter_autocomplete.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/service_response_time_table.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/filter_autocomplete.h" + +#include "ui/gtk/old-gtk-compat.h" /* used to keep track of the statistics for an entire program interface */ typedef struct _rpcstat_t { diff --git a/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index abd64a9fb0..1d647056ab 100644 --- a/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -71,26 +71,26 @@ #include "../tempfile.h" #include <wsutil/file_util.h> -#include "gtk/gtkglobals.h" -#include "gtk/dlg_utils.h" -#include "gtk/file_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/pixmap_save.h" -#include "gtk/main.h" -#include "gtk/rtp_analysis.h" -#include "gtk/rtp_stream.h" -#include "gtk/rtp_stream_dlg.h" -#include "gtk/stock_icons.h" -#include "gtk/utf8_entities.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/pixmap_save.h" +#include "ui/gtk/main.h" +#include "ui/gtk/rtp_analysis.h" +#include "ui/gtk/rtp_stream.h" +#include "ui/gtk/rtp_stream_dlg.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/utf8_entities.h" #ifdef HAVE_LIBPORTAUDIO -#include "gtk/graph_analysis.h" -#include "gtk/voip_calls.h" -#include "gtk/rtp_player.h" +#include "ui/gtk/graph_analysis.h" +#include "ui/gtk/voip_calls.h" +#include "ui/gtk/rtp_player.h" #endif /* HAVE_LIBPORTAUDIO */ -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" enum { diff --git a/gtk/rtp_analysis.h b/ui/gtk/rtp_analysis.h index 28972b1e99..28972b1e99 100644 --- a/gtk/rtp_analysis.h +++ b/ui/gtk/rtp_analysis.h diff --git a/gtk/rtp_player.c b/ui/gtk/rtp_player.c index 96505c3354..e0f3f76da4 100644 --- a/gtk/rtp_player.c +++ b/ui/gtk/rtp_player.c @@ -74,16 +74,16 @@ #include "../codecs/G711a/G711adecode.h" #include "../codecs/G711u/G711udecode.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/graph_analysis.h" -#include "gtk/voip_calls_dlg.h" -#include "gtk/voip_calls.h" -#include "gtk/gtkglobals.h" -#include "gtk/rtp_player.h" -#include "gtk/stock_icons.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/graph_analysis.h" +#include "ui/gtk/voip_calls_dlg.h" +#include "ui/gtk/voip_calls.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/rtp_player.h" +#include "ui/gtk/stock_icons.h" + +#include "ui/gtk/old-gtk-compat.h" /*define this symbol to compile with G729 and G723 codecs*/ /*#define HAVE_G729_G723 1*/ diff --git a/gtk/rtp_player.h b/ui/gtk/rtp_player.h index b7edd1991b..b7edd1991b 100644 --- a/gtk/rtp_player.h +++ b/ui/gtk/rtp_player.h diff --git a/gtk/rtp_stream.c b/ui/gtk/rtp_stream.c index 85d28cdbd1..2d96a10d93 100644 --- a/gtk/rtp_stream.c +++ b/ui/gtk/rtp_stream.c @@ -53,9 +53,9 @@ #include "../tap-rtp-common.h" #include <wsutil/file_util.h> -#include "gtk/rtp_stream.h" -#include "gtk/rtp_stream_dlg.h" -#include "gtk/main.h" +#include "ui/gtk/rtp_stream.h" +#include "ui/gtk/rtp_stream_dlg.h" +#include "ui/gtk/main.h" /* The one and only global rtpstream_tapinfo_t structure for tshark and wireshark. */ diff --git a/gtk/rtp_stream.h b/ui/gtk/rtp_stream.h index e539b6ee4b..e539b6ee4b 100644 --- a/gtk/rtp_stream.h +++ b/ui/gtk/rtp_stream.h diff --git a/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c index 75595a65a1..977e616ae0 100644 --- a/gtk/rtp_stream_dlg.c +++ b/ui/gtk/rtp_stream_dlg.c @@ -43,15 +43,15 @@ #include "../stat_menu.h" #include "../simple_dialog.h" -#include "gtk/rtp_stream_dlg.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/file_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/gtkglobals.h" -#include "gtk/rtp_stream.h" -#include "gtk/rtp_analysis.h" -#include "gtk/stock_icons.h" +#include "ui/gtk/rtp_stream_dlg.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/rtp_stream.h" +#include "ui/gtk/rtp_analysis.h" +#include "ui/gtk/stock_icons.h" static const gchar FWD_LABEL_TEXT[] = "Select a forward stream with left mouse button, and then"; static const gchar FWD_ONLY_LABEL_TEXT[] = "Select a forward stream with Ctrl + left mouse button"; diff --git a/gtk/rtp_stream_dlg.h b/ui/gtk/rtp_stream_dlg.h index a459b4ed02..a459b4ed02 100644 --- a/gtk/rtp_stream_dlg.h +++ b/ui/gtk/rtp_stream_dlg.h diff --git a/gtk/sat.h b/ui/gtk/sat.h index c0cb1a08bc..c0cb1a08bc 100644 --- a/gtk/sat.h +++ b/ui/gtk/sat.h diff --git a/gtk/scsi_stat.c b/ui/gtk/scsi_stat.c index f7b8841701..4e4fe8658a 100644 --- a/gtk/scsi_stat.c +++ b/ui/gtk/scsi_stat.c @@ -50,15 +50,15 @@ #include "../globals.h" #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/main.h" -#include "gtk/service_response_time_table.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gtkglobals.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/service_response_time_table.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gtkglobals.h" + +#include "ui/gtk/old-gtk-compat.h" /* used to keep track of the statistics for an entire scsi command set */ typedef struct _scsistat_t { diff --git a/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c index 86e7f07a90..27e1352294 100644 --- a/gtk/sctp_assoc_analyse.c +++ b/ui/gtk/sctp_assoc_analyse.c @@ -36,12 +36,12 @@ #include "../simple_dialog.h" #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/main.h" -#include "gtk/sctp_stat.h" -#include "gtk/gtkglobals.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/sctp_stat.h" +#include "ui/gtk/gtkglobals.h" static sctp_assoc_info_t static_assoc; diff --git a/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c index 03cc7fc490..6be366fbbb 100644 --- a/gtk/sctp_byte_graph_dlg.c +++ b/ui/gtk/sctp_byte_graph_dlg.c @@ -38,11 +38,11 @@ #include "../ui_util.h" #include "../simple_dialog.h" -#include "gtk/dlg_utils.h" -#include "gtk/main.h" -#include "gtk/sctp_stat.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/sctp_stat.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" #define DEFAULT_PIXELS_PER_TICK 2 #define MAX_PIXELS_PER_TICK 4 diff --git a/gtk/sctp_chunk_stat.c b/ui/gtk/sctp_chunk_stat.c index 6fba1ee100..6c7d86c7c0 100644 --- a/gtk/sctp_chunk_stat.c +++ b/ui/gtk/sctp_chunk_stat.c @@ -47,12 +47,12 @@ #include "../globals.h" #include "../stat_menu.h" -#include "gtk/gui_stat_util.h" -#include "gtk/dlg_utils.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/main.h" -#include "gtk/sctp_stat.h" +#include "ui/gtk/gui_stat_util.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/sctp_stat.h" static void sctpstat_init(const char *optarg, void *userdata); diff --git a/gtk/sctp_chunk_stat_dlg.c b/ui/gtk/sctp_chunk_stat_dlg.c index c0a7b41b8d..a44741de68 100644 --- a/gtk/sctp_chunk_stat_dlg.c +++ b/ui/gtk/sctp_chunk_stat_dlg.c @@ -34,10 +34,10 @@ #include "../globals.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/main.h" -#include "gtk/sctp_stat.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/sctp_stat.h" static GtkWidget *clist = NULL; static GList *last_list = NULL; diff --git a/gtk/sctp_error_dlg.c b/ui/gtk/sctp_error_dlg.c index db2a254dcc..cca516785a 100644 --- a/gtk/sctp_error_dlg.c +++ b/ui/gtk/sctp_error_dlg.c @@ -33,10 +33,10 @@ #include "../globals.h" #include "../simple_dialog.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/main.h" -#include "gtk/sctp_stat.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/sctp_stat.h" static GtkWidget *sctp_error_dlg=NULL; diff --git a/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c index 6309751f3a..149fe9ce71 100644 --- a/gtk/sctp_graph_dlg.c +++ b/ui/gtk/sctp_graph_dlg.c @@ -39,11 +39,11 @@ #include "../ui_util.h" #include "../simple_dialog.h" -#include "gtk/dlg_utils.h" -#include "gtk/main.h" -#include "gtk/sctp_stat.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/sctp_stat.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" #define DEFAULT_PIXELS_PER_TICK 2 #define MAX_PIXELS_PER_TICK 4 diff --git a/gtk/sctp_stat.c b/ui/gtk/sctp_stat.c index f547febebc..1f4cf849a1 100644 --- a/gtk/sctp_stat.c +++ b/ui/gtk/sctp_stat.c @@ -38,9 +38,9 @@ #include "../simple_dialog.h" -#include "gtk/dlg_utils.h" -#include "gtk/sctp_stat.h" -#include "gtk/main.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/sctp_stat.h" +#include "ui/gtk/main.h" #define SCTP_ABORT_CHUNK_T_BIT 0x01 diff --git a/gtk/sctp_stat.h b/ui/gtk/sctp_stat.h index 0c68154d03..0c68154d03 100644 --- a/gtk/sctp_stat.h +++ b/ui/gtk/sctp_stat.h diff --git a/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c index 49ccf843a9..c66cf6767a 100644 --- a/gtk/sctp_stat_dlg.c +++ b/ui/gtk/sctp_stat_dlg.c @@ -34,14 +34,14 @@ #include "../globals.h" #include "../stat_menu.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/main.h" -#include "gtk/sctp_stat.h" -#include "gtk/gtkglobals.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/main.h" +#include "ui/gtk/sctp_stat.h" +#include "ui/gtk/gtkglobals.h" + +#include "ui/gtk/old-gtk-compat.h" static GtkWidget *sctp_stat_dlg=NULL; static GtkWidget *clist = NULL; diff --git a/gtk/service_response_time_table.c b/ui/gtk/service_response_time_table.c index 31c94d83f2..61392e9d60 100644 --- a/gtk/service_response_time_table.c +++ b/ui/gtk/service_response_time_table.c @@ -35,10 +35,10 @@ #include "../simple_dialog.h" -#include "gtk/service_response_time_table.h" -#include "gtk/filter_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/utf8_entities.h" +#include "ui/gtk/service_response_time_table.h" +#include "ui/gtk/filter_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/utf8_entities.h" #define NANOSECS_PER_SEC 1000000000 diff --git a/gtk/service_response_time_table.h b/ui/gtk/service_response_time_table.h index 46da3700ee..46da3700ee 100644 --- a/gtk/service_response_time_table.h +++ b/ui/gtk/service_response_time_table.h diff --git a/gtk/simple_dialog.c b/ui/gtk/simple_dialog.c index 1e43a95f86..3504195dc1 100644 --- a/gtk/simple_dialog.c +++ b/ui/gtk/simple_dialog.c @@ -33,12 +33,12 @@ #include "../simple_dialog.h" -#include "gtk/gtkglobals.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/stock_icons.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/stock_icons.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" static void simple_dialog_cancel_cb(GtkWidget *, gpointer); diff --git a/gtk/sip_stat.c b/ui/gtk/sip_stat.c index 23d6333279..f8a68dd641 100644 --- a/gtk/sip_stat.c +++ b/ui/gtk/sip_stat.c @@ -39,12 +39,12 @@ #include "../globals.h" #include "../stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/main.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/main.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" #define SUM_STR_MAX 1024 diff --git a/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c index 94b782c4e2..fa1eb626f7 100644 --- a/gtk/smb2_stat.c +++ b/ui/gtk/smb2_stat.c @@ -45,14 +45,14 @@ #include "../globals.h" #include "../stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/service_response_time_table.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gtkglobals.h" -#include "gtk/main.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/service_response_time_table.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/main.h" + +#include "ui/gtk/old-gtk-compat.h" /* used to keep track of the statistics for an entire program interface */ typedef struct _smb2stat_t { diff --git a/gtk/smb_stat.c b/ui/gtk/smb_stat.c index d907d8bf1f..8502448308 100644 --- a/gtk/smb_stat.c +++ b/ui/gtk/smb_stat.c @@ -45,14 +45,14 @@ #include "../globals.h" #include "../stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/service_response_time_table.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gtkglobals.h" -#include "gtk/main.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/service_response_time_table.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/main.h" + +#include "ui/gtk/old-gtk-compat.h" /* used to keep track of the statistics for an entire program interface */ typedef struct _smbstat_t { diff --git a/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c index 6ae858f408..250db6b87f 100644 --- a/gtk/stats_tree_stat.c +++ b/ui/gtk/stats_tree_stat.c @@ -37,12 +37,12 @@ #include "../globals.h" #include "../stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/main.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/main.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" struct _st_node_pres { GtkTreeIter* iter; diff --git a/gtk/stock_icons.c b/ui/gtk/stock_icons.c index 7a825e3daf..52456dca18 100644 --- a/gtk/stock_icons.c +++ b/ui/gtk/stock_icons.c @@ -29,7 +29,7 @@ #include <gtk/gtk.h> -#include "gtk/stock_icons.h" +#include "ui/gtk/stock_icons.h" /* these icons are derived from the original stock icons */ #include "../image/toolbar/capture_interfaces_24.xpm" diff --git a/gtk/stock_icons.h b/ui/gtk/stock_icons.h index 3158a1732a..3158a1732a 100644 --- a/gtk/stock_icons.h +++ b/ui/gtk/stock_icons.h diff --git a/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c index df74339ef4..12a312053e 100644 --- a/gtk/summary_dlg.c +++ b/ui/gtk/summary_dlg.c @@ -44,14 +44,14 @@ #include "../capture-pcap-util.h" #ifdef HAVE_LIBPCAP #include "../capture.h" -#include "gtk/main.h" -#include "gtk/capture_globals.h" +#include "ui/gtk/main.h" +#include "ui/gtk/capture_globals.h" #endif -#include "gtk/summary_dlg.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/help_dlg.h" +#include "ui/gtk/summary_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/help_dlg.h" #define SUM_STR_MAX 1024 #define FILTER_SNIP_LEN 50 diff --git a/gtk/summary_dlg.h b/ui/gtk/summary_dlg.h index d3f003b49d..d3f003b49d 100644 --- a/gtk/summary_dlg.h +++ b/ui/gtk/summary_dlg.h diff --git a/gtk/supported_protos_dlg.c b/ui/gtk/supported_protos_dlg.c index 4a7a6700c7..711e9bded6 100644 --- a/gtk/supported_protos_dlg.c +++ b/ui/gtk/supported_protos_dlg.c @@ -36,11 +36,11 @@ #include "../globals.h" -#include "gtk/supported_protos_dlg.h" -#include "gtk/gtkglobals.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/font_utils.h" +#include "ui/gtk/supported_protos_dlg.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/font_utils.h" diff --git a/gtk/supported_protos_dlg.h b/ui/gtk/supported_protos_dlg.h index 1ce2b6b846..1ce2b6b846 100644 --- a/gtk/supported_protos_dlg.h +++ b/ui/gtk/supported_protos_dlg.h diff --git a/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c index 1c9ca0d755..731d778fee 100644 --- a/gtk/tap_param_dlg.c +++ b/ui/gtk/tap_param_dlg.c @@ -43,16 +43,16 @@ #include "../globals.h" #include "../stat_menu.h" -#include "gtk/stock_icons.h" -#include "gtk/dlg_utils.h" -#include "gtk/filter_dlg.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/gui_utils.h" -#include "gtk/gtkglobals.h" -#include "gtk/filter_autocomplete.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/filter_dlg.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/filter_autocomplete.h" + +#include "ui/gtk/old-gtk-compat.h" typedef struct _tap_param_dlg_list_item { GtkWidget *dlg; diff --git a/gtk/tap_param_dlg.h b/ui/gtk/tap_param_dlg.h index b4cc917705..b4cc917705 100644 --- a/gtk/tap_param_dlg.h +++ b/ui/gtk/tap_param_dlg.h diff --git a/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c index 3317cbb911..4085cb31dc 100644 --- a/gtk/tcp_graph.c +++ b/ui/gtk/tcp_graph.c @@ -55,11 +55,11 @@ #include "../simple_dialog.h" #include "../stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_stat_menu.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_stat_menu.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" #define TH_FIN 0x01 #define TH_SYN 0x02 diff --git a/gtk/text_import.c b/ui/gtk/text_import.c index 5c032739e7..5c032739e7 100644 --- a/gtk/text_import.c +++ b/ui/gtk/text_import.c diff --git a/gtk/text_import.h b/ui/gtk/text_import.h index c64d462665..c64d462665 100644 --- a/gtk/text_import.h +++ b/ui/gtk/text_import.h diff --git a/gtk/text_import_scanner.h b/ui/gtk/text_import_scanner.h index 70eba44626..70eba44626 100644 --- a/gtk/text_import_scanner.h +++ b/ui/gtk/text_import_scanner.h diff --git a/gtk/text_import_scanner.l b/ui/gtk/text_import_scanner.l index bd59c749d6..bd59c749d6 100644 --- a/gtk/text_import_scanner.l +++ b/ui/gtk/text_import_scanner.l diff --git a/gtk/text_page_utils.c b/ui/gtk/text_page_utils.c index 4c06bfc5c4..753e7e296d 100644 --- a/gtk/text_page_utils.c +++ b/ui/gtk/text_page_utils.c @@ -38,9 +38,9 @@ #include "../simple_dialog.h" #include <wsutil/file_util.h> -#include "gtk/text_page_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/font_utils.h" +#include "ui/gtk/text_page_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/font_utils.h" #define TEXT_KEY "txt_key" diff --git a/gtk/text_page_utils.h b/ui/gtk/text_page_utils.h index dc864ab68c..dc864ab68c 100644 --- a/gtk/text_page_utils.h +++ b/ui/gtk/text_page_utils.h diff --git a/gtk/time_shift_dlg.c b/ui/gtk/time_shift_dlg.c index bf01629206..51d8db68f6 100644 --- a/gtk/time_shift_dlg.c +++ b/ui/gtk/time_shift_dlg.c @@ -44,13 +44,13 @@ #include "../simple_dialog.h" #include "../main_statusbar.h" -#include "gtk/gui_utils.h" -#include "gtk/time_shift_dlg.h" -#include "gtk/dlg_utils.h" -#include "gtk/stock_icons.h" -#include "gtk/prefs_dlg.h" -#include "gtk/keys.h" -#include "gtk/help_dlg.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/time_shift_dlg.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/prefs_dlg.h" +#include "ui/gtk/keys.h" +#include "ui/gtk/help_dlg.h" #include "ui_util.h" /* Capture callback data keys */ diff --git a/gtk/time_shift_dlg.h b/ui/gtk/time_shift_dlg.h index 3ac4442507..3ac4442507 100644 --- a/gtk/time_shift_dlg.h +++ b/ui/gtk/time_shift_dlg.h diff --git a/gtk/uat_gui.c b/ui/gtk/uat_gui.c index f4ad2d1e0c..bea21d33d4 100644 --- a/gtk/uat_gui.c +++ b/ui/gtk/uat_gui.c @@ -61,15 +61,15 @@ #include "../stat_menu.h" -#include "gtk/gtkglobals.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/help_dlg.h" -#include "gtk/stock_icons.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/main.h" -#include "gtk/uat_gui.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/stock_icons.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/main.h" +#include "ui/gtk/uat_gui.h" +#include "ui/gtk/old-gtk-compat.h" # define BUTTON_SIZE_X -1 # define BUTTON_SIZE_Y -1 diff --git a/gtk/uat_gui.h b/ui/gtk/uat_gui.h index d9324462fe..d9324462fe 100644 --- a/gtk/uat_gui.h +++ b/ui/gtk/uat_gui.h diff --git a/gtk/ui/main-menubar-ui.xml b/ui/gtk/ui/main-menubar-ui.xml index beb8c8305d..beb8c8305d 100644 --- a/gtk/ui/main-menubar-ui.xml +++ b/ui/gtk/ui/main-menubar-ui.xml diff --git a/gtk/utf8_entities.h b/ui/gtk/utf8_entities.h index b693b14459..b693b14459 100644 --- a/gtk/utf8_entities.h +++ b/ui/gtk/utf8_entities.h diff --git a/gtk/voip_calls.c b/ui/gtk/voip_calls.c index ae91af9ad6..cec92c1d91 100644 --- a/gtk/voip_calls.c +++ b/ui/gtk/voip_calls.c @@ -66,13 +66,13 @@ #include "../simple_dialog.h" #include "../ui_util.h" -#include "gtk/graph_analysis.h" -#include "gtk/voip_calls.h" -#include "gtk/voip_calls_dlg.h" -#include "gtk/main.h" +#include "ui/gtk/graph_analysis.h" +#include "ui/gtk/voip_calls.h" +#include "ui/gtk/voip_calls_dlg.h" +#include "ui/gtk/main.h" #ifdef HAVE_LIBPORTAUDIO -#include "gtk/rtp_player.h" +#include "ui/gtk/rtp_player.h" #endif /* HAVE_LIBPORTAUDIO */ diff --git a/gtk/voip_calls.h b/ui/gtk/voip_calls.h index d6ff33ca43..d6ff33ca43 100644 --- a/gtk/voip_calls.h +++ b/ui/gtk/voip_calls.h diff --git a/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c index b93fa76ee9..d037b06d32 100644 --- a/gtk/voip_calls_dlg.c +++ b/ui/gtk/voip_calls_dlg.c @@ -41,7 +41,7 @@ #include <string.h> #include <ctype.h> -#include "gtk/gtk.h" +#include <gtk/gtk.h> #include <epan/epan.h> #include <epan/packet.h> @@ -56,23 +56,23 @@ #include "../globals.h" #include "../stat_menu.h" -#include "gtk/graph_analysis.h" -#include "gtk/voip_calls_dlg.h" -#include "gtk/voip_calls.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/dlg_utils.h" -#include "gtk/gui_utils.h" -#include "gtk/gtkglobals.h" -#include "gtk/stock_icons.h" +#include "ui/gtk/graph_analysis.h" +#include "ui/gtk/voip_calls_dlg.h" +#include "ui/gtk/voip_calls.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/stock_icons.h" #include "simple_dialog.h" #ifdef HAVE_LIBPORTAUDIO -#include "gtk/rtp_analysis.h" -#include "gtk/rtp_player.h" +#include "ui/gtk/rtp_analysis.h" +#include "ui/gtk/rtp_player.h" #endif /* HAVE_LIBPORTAUDIO */ -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" /****************************************************************************/ /* pointer to the one and only dialog window */ diff --git a/gtk/voip_calls_dlg.h b/ui/gtk/voip_calls_dlg.h index 2b80493c57..2b80493c57 100644 --- a/gtk/voip_calls_dlg.h +++ b/ui/gtk/voip_calls_dlg.h diff --git a/gtk/webbrowser.c b/ui/gtk/webbrowser.c index 932b8501bc..6ffaf61d8a 100644 --- a/gtk/webbrowser.c +++ b/ui/gtk/webbrowser.c @@ -77,7 +77,7 @@ #include "../simple_dialog.h" -#include "gtk/webbrowser.h" +#include "ui/gtk/webbrowser.h" #if defined(G_OS_WIN32) /* Win32 - use Windows shell services to start a browser */ diff --git a/gtk/webbrowser.h b/ui/gtk/webbrowser.h index 09a70aa7a0..09a70aa7a0 100644 --- a/gtk/webbrowser.h +++ b/ui/gtk/webbrowser.h diff --git a/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c index 3e9e14ca3f..ca61f793e5 100644 --- a/gtk/wlan_stat_dlg.c +++ b/ui/gtk/wlan_stat_dlg.c @@ -43,17 +43,17 @@ #include "../simple_dialog.h" #include "../stat_menu.h" -#include "gtk/gtkglobals.h" -#include "gtk/dlg_utils.h" -#include "gtk/filter_utils.h" -#include "gtk/gui_stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/recent.h" -#include "gtk/help_dlg.h" -#include "gtk/main.h" -#include "gtk/utf8_entities.h" - -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/gtkglobals.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/filter_utils.h" +#include "ui/gtk/gui_stat_menu.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/recent.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/main.h" +#include "ui/gtk/utf8_entities.h" + +#include "ui/gtk/old-gtk-compat.h" enum { BSSID_COLUMN, diff --git a/gtk/wsp_stat.c b/ui/gtk/wsp_stat.c index 6f717fea2a..edcf1cf841 100644 --- a/gtk/wsp_stat.c +++ b/ui/gtk/wsp_stat.c @@ -40,12 +40,12 @@ #include "../globals.h" #include "../stat_menu.h" -#include "gtk/gui_utils.h" -#include "gtk/dlg_utils.h" -#include "gtk/tap_param_dlg.h" -#include "gtk/main.h" +#include "ui/gtk/gui_utils.h" +#include "ui/gtk/dlg_utils.h" +#include "ui/gtk/tap_param_dlg.h" +#include "ui/gtk/main.h" -#include "gtk/old-gtk-compat.h" +#include "ui/gtk/old-gtk-compat.h" /* used to keep track of the stats for a specific PDU type*/ typedef struct _wsp_pdu_t { diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index 2f91b73b22..9a90188f6d 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -37,13 +37,13 @@ win32:INCLUDEPATH += \ $${WIRESHARK_LIB_DIR}/AirPcap_Devpack_4_1_0_1622/Airpcap_Devpack/include \ $${WIRESHARK_LIB_DIR}/zlib125/include -# XXX - If we add ../../gtk/recent.c to SOURCES, jom will try to compile everything -# in ../../gtk. Until we move the things we need in recent.c to a common file, simply +# XXX - If we add ../gtk/recent.c to SOURCES, jom will try to compile everything +# in ../gtk. Until we move the things we need in recent.c to a common file, simply # copy it to our current directory. recent.target = recent.c -!win32:recent.commands = $$QMAKE_COPY ../../gtk/$$recent.target . -win32:recent.commands = $$QMAKE_COPY ..\\..\\gtk\\$$recent.target . -recent.depends = ../../gtk/$$recent.target +!win32:recent.commands = $$QMAKE_COPY ../gtk/$$recent.target . +win32:recent.commands = $$QMAKE_COPY ..\\gtk\\$$recent.target . +recent.depends = ../gtk/$$recent.target QMAKE_EXTRA_TARGETS += recent SOURCES += \ diff --git a/ui/qt/capture_interface_dialog.cpp b/ui/qt/capture_interface_dialog.cpp index d1817d96cf..be9114a4de 100644 --- a/ui/qt/capture_interface_dialog.cpp +++ b/ui/qt/capture_interface_dialog.cpp @@ -27,7 +27,7 @@ #include "qt_ui_utils.h" -#include "gtk/recent.h" +#include "ui/gtk/recent.h" #include <epan/prefs.h> diff --git a/ui/qt/display_filter_combo.cpp b/ui/qt/display_filter_combo.cpp index 626d2198be..48eaa7aafd 100644 --- a/ui/qt/display_filter_combo.cpp +++ b/ui/qt/display_filter_combo.cpp @@ -24,7 +24,7 @@ #include <stdio.h> #include "qt_ui_utils.h" -#include "gtk/recent.h" +#include "ui/gtk/recent.h" #include "display_filter_edit.h" diff --git a/ui/qt/display_filter_edit.cpp b/ui/qt/display_filter_edit.cpp index 84a1b55a48..fd8c3a0cab 100644 --- a/ui/qt/display_filter_edit.cpp +++ b/ui/qt/display_filter_edit.cpp @@ -31,7 +31,7 @@ #include "display_filter_edit.h" -#include "gtk/utf8_entities.h" +#include "ui/gtk/utf8_entities.h" // platform // osx diff --git a/ui/qt/interface_tree.cpp b/ui/qt/interface_tree.cpp index 39e4001462..b6061bde34 100644 --- a/ui/qt/interface_tree.cpp +++ b/ui/qt/interface_tree.cpp @@ -55,7 +55,7 @@ InterfaceTree::InterfaceTree(QWidget *parent) : ); if_list = capture_interface_list(&err, &err_str); - g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: move if_list_comparator_alph out of gtk/"); + g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: move if_list_comparator_alph out of ui/gtk/"); // if_list = g_list_sort(if_list, if_list_comparator_alph); if (if_list == NULL && err == CANT_GET_INTERFACE_LIST) { diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index 60447be151..e149176782 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -80,7 +80,7 @@ #include "u3.h" #include <wsutil/file_util.h> -#include "gtk/recent.h" +#include "ui/gtk/recent.h" #ifdef HAVE_LIBPCAP #include "capture_ui_utils.h" @@ -141,7 +141,7 @@ void create_console(void); capture_options global_capture_opts; #endif -// Copied from gtk/gui_utils.c +// Copied from ui/gtk/gui_utils.c void pipe_input_set_handler(gint source, gpointer user_data, int *child_process, pipe_input_cb_t input_cb) { // static pipe_input_t pipe_input; @@ -179,7 +179,7 @@ main_cf_callback(gint event, gpointer data, gpointer user_data ) wsApp->captureFileCallback(event, data); } -// XXX Copied from gtk/main.c. This should be moved to a common location. +// XXX Copied from ui/gtk/main.c. This should be moved to a common location. static e_prefs * read_configuration_files(char **gdp_path, char **dp_path) { diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index db15c0a65e..56cfa832ea 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -250,7 +250,7 @@ void MainWindow::recentActionTriggered() { } } -// XXX - Copied from gtk/menus.c +// XXX - Copied from ui/gtk/menus.c /** * Add the capture filename (with an absolute path) to the "Recent Files" menu. diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp index a00bbc63b8..91cbb4cb82 100644 --- a/ui/qt/packet_list.cpp +++ b/ui/qt/packet_list.cpp @@ -43,7 +43,7 @@ #include "qt_ui_utils.h" #include "main_statusbar.h" -#include "gtk/recent.h" +#include "ui/gtk/recent.h" #include <QTreeWidget> #include <QTabWidget> @@ -74,7 +74,7 @@ new_packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo return visible_pos; } -// Copied from gtk/new_packet_list.c +// Copied from ui/gtk/new_packet_list.c void new_packet_list_resize_column(gint col) { // xxx qtshark diff --git a/ui/qt/qt_ui_utils.cpp b/ui/qt/qt_ui_utils.cpp index 5f694265e8..8a40b661b1 100644 --- a/ui/qt/qt_ui_utils.cpp +++ b/ui/qt/qt_ui_utils.cpp @@ -26,9 +26,9 @@ #include "qt_ui_utils.h" -#include "gtk/recent.h" +#include "ui/gtk/recent.h" -// XXX - Copied from gtk/gui_utils.c +// XXX - Copied from ui/gtk/gui_utils.c #define WINDOW_GEOM_KEY "window_geom" diff --git a/ui/qt/qt_ui_utils.h b/ui/qt/qt_ui_utils.h index 50b0808f8c..bb5ce0d21a 100644 --- a/ui/qt/qt_ui_utils.h +++ b/ui/qt/qt_ui_utils.h @@ -25,7 +25,7 @@ #ifndef __QT_UI_UTILS_H__ #define __QT_UI_UTILS_H__ -// xxx - copied from gtk/gui_utils.h +// xxx - copied from ui/gtk/gui_utils.h #include <stdio.h> diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp index b2b0981f0e..2d1a359723 100644 --- a/ui/qt/wireshark_application.cpp +++ b/ui/qt/wireshark_application.cpp @@ -40,7 +40,7 @@ WiresharkApplication *wsApp = NULL; -// XXX - Copied from gtk/file_dlg.c +// XXX - Copied from ui/gtk/file_dlg.c static char *last_open_dir = NULL; static bool updated_last_open_dir = FALSE; diff --git a/win32/file_dlg_win32.c b/win32/file_dlg_win32.c index 88edf7dbdc..7640a81832 100644 --- a/win32/file_dlg_win32.c +++ b/win32/file_dlg_win32.c @@ -57,15 +57,15 @@ #include "../color_filters.h" #include "../merge.h" -#include "gtk/file_dlg.h" -#include "gtk/capture_file_dlg.h" -#include "gtk/main.h" -#include "gtk/menus.h" -#include "gtk/drag_and_drop.h" -#include "gtk/capture_dlg.h" +#include "ui/gtk/file_dlg.h" +#include "ui/gtk/capture_file_dlg.h" +#include "ui/gtk/main.h" +#include "ui/gtk/menus.h" +#include "ui/gtk/drag_and_drop.h" +#include "ui/gtk/capture_dlg.h" #include "win32/file_dlg_win32.h" -#include "gtk/help_dlg.h" -#include "gtk/export_sslkeys.h" +#include "ui/gtk/help_dlg.h" +#include "ui/gtk/export_sslkeys.h" typedef enum { merge_append, @@ -1369,7 +1369,7 @@ open_file_hook_proc(HWND of_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { return 0; } -/* XXX - Copied verbatim from gtk/capture_file_dlg.c. Perhaps it +/* XXX - Copied verbatim from ui/gtk/capture_file_dlg.c. Perhaps it * should be in wiretap instead? */ |