Move gtk to ui/gtk.
authorJörg Mayer <jmayer@loplof.de>
Sun, 15 Jan 2012 21:59:11 +0000 (21:59 -0000)
committerJörg Mayer <jmayer@loplof.de>
Sun, 15 Jan 2012 21:59:11 +0000 (21:59 -0000)
This looses the last checkin to gtk, will add this manually back.

svn path=/trunk/; revision=40518

322 files changed:
CMakeLists.txt
Makefile.am
Makefile.nmake
configure.in
epan/plugins.c
epan/timestamp.c
file.c
packaging/nsis/wireshark.nsi
tap-megaco-common.h
tap-rtp-common.c
tap-rtp-common.h
tap-rtp.c
tap-sipstat.c
ui/gtk/CMakeLists.txt [moved from gtk/CMakeLists.txt with 100% similarity]
ui/gtk/Makefile.am [moved from gtk/Makefile.am with 100% similarity]
ui/gtk/Makefile.common [moved from gtk/Makefile.common with 100% similarity]
ui/gtk/Makefile.nmake [moved from gtk/Makefile.nmake with 100% similarity]
ui/gtk/Makefile_custom.common [moved from gtk/Makefile_custom.common with 100% similarity]
ui/gtk/STATUS.gtk3 [moved from gtk/STATUS.gtk3 with 90% similarity]
ui/gtk/about_dlg.c [moved from gtk/about_dlg.c with 98% similarity]
ui/gtk/about_dlg.h [moved from gtk/about_dlg.h with 100% similarity]
ui/gtk/afp_stat.c [moved from gtk/afp_stat.c with 96% similarity]
ui/gtk/airpcap_dlg.c [moved from gtk/airpcap_dlg.c with 99% similarity]
ui/gtk/airpcap_dlg.h [moved from gtk/airpcap_dlg.h with 100% similarity]
ui/gtk/airpcap_gui_utils.c [moved from gtk/airpcap_gui_utils.c with 99% similarity]
ui/gtk/airpcap_gui_utils.h [moved from gtk/airpcap_gui_utils.h with 100% similarity]
ui/gtk/ansi_a_stat.c [moved from gtk/ansi_a_stat.c with 98% similarity]
ui/gtk/ansi_map_stat.c [moved from gtk/ansi_map_stat.c with 98% similarity]
ui/gtk/bootp_stat.c [moved from gtk/bootp_stat.c with 98% similarity]
ui/gtk/camel_counter.c [moved from gtk/camel_counter.c with 97% similarity]
ui/gtk/camel_srt.c [moved from gtk/camel_srt.c with 96% similarity]
ui/gtk/capture_dlg.c [moved from gtk/capture_dlg.c with 99% similarity]
ui/gtk/capture_dlg.h [moved from gtk/capture_dlg.h with 100% similarity]
ui/gtk/capture_file_dlg.c [moved from gtk/capture_file_dlg.c with 99% similarity]
ui/gtk/capture_file_dlg.h [moved from gtk/capture_file_dlg.h with 100% similarity]
ui/gtk/capture_globals.h [moved from gtk/capture_globals.h with 100% similarity]
ui/gtk/capture_if_details_dlg_win32.c [moved from gtk/capture_if_details_dlg_win32.c with 99% similarity]
ui/gtk/capture_if_details_dlg_win32.h [moved from gtk/capture_if_details_dlg_win32.h with 100% similarity]
ui/gtk/capture_if_dlg.c [moved from gtk/capture_if_dlg.c with 98% similarity]
ui/gtk/capture_if_dlg.h [moved from gtk/capture_if_dlg.h with 100% similarity]
ui/gtk/capture_info_dlg.c [moved from gtk/capture_info_dlg.c with 98% similarity]
ui/gtk/cfilter_combo_utils.c [moved from gtk/cfilter_combo_utils.c with 95% similarity]
ui/gtk/cfilter_combo_utils.h [moved from gtk/cfilter_combo_utils.h with 100% similarity]
ui/gtk/color_dlg.c [moved from gtk/color_dlg.c with 98% similarity]
ui/gtk/color_dlg.h [moved from gtk/color_dlg.h with 100% similarity]
ui/gtk/color_edit_dlg.c [moved from gtk/color_edit_dlg.c with 98% similarity]
ui/gtk/color_edit_dlg.h [moved from gtk/color_edit_dlg.h with 100% similarity]
ui/gtk/color_utils.c [moved from gtk/color_utils.c with 98% similarity]
ui/gtk/color_utils.h [moved from gtk/color_utils.h with 100% similarity]
ui/gtk/compare_stat.c [moved from gtk/compare_stat.c with 99% similarity]
ui/gtk/conversations_eth.c [moved from gtk/conversations_eth.c with 96% similarity]
ui/gtk/conversations_fc.c [moved from gtk/conversations_fc.c with 96% similarity]
ui/gtk/conversations_fddi.c [moved from gtk/conversations_fddi.c with 96% similarity]
ui/gtk/conversations_ip.c [moved from gtk/conversations_ip.c with 96% similarity]
ui/gtk/conversations_ipv6.c [moved from gtk/conversations_ipv6.c with 97% similarity]
ui/gtk/conversations_ipx.c [moved from gtk/conversations_ipx.c with 96% similarity]
ui/gtk/conversations_jxta.c [moved from gtk/conversations_jxta.c with 96% similarity]
ui/gtk/conversations_ncp.c [moved from gtk/conversations_ncp.c with 96% similarity]
ui/gtk/conversations_rsvp.c [moved from gtk/conversations_rsvp.c with 96% similarity]
ui/gtk/conversations_sctp.c [moved from gtk/conversations_sctp.c with 96% similarity]
ui/gtk/conversations_table.c [moved from gtk/conversations_table.c with 99% similarity]
ui/gtk/conversations_table.h [moved from gtk/conversations_table.h with 100% similarity]
ui/gtk/conversations_tcpip.c [moved from gtk/conversations_tcpip.c with 96% similarity]
ui/gtk/conversations_tr.c [moved from gtk/conversations_tr.c with 96% similarity]
ui/gtk/conversations_udpip.c [moved from gtk/conversations_udpip.c with 96% similarity]
ui/gtk/conversations_usb.c [moved from gtk/conversations_usb.c with 96% similarity]
ui/gtk/conversations_wlan.c [moved from gtk/conversations_wlan.c with 96% similarity]
ui/gtk/dcerpc_stat.c [moved from gtk/dcerpc_stat.c with 98% similarity]
ui/gtk/decode_as_ber.c [moved from gtk/decode_as_ber.c with 96% similarity]
ui/gtk/decode_as_ber.h [moved from gtk/decode_as_ber.h with 100% similarity]
ui/gtk/decode_as_dcerpc.c [moved from gtk/decode_as_dcerpc.c with 98% similarity]
ui/gtk/decode_as_dcerpc.h [moved from gtk/decode_as_dcerpc.h with 100% similarity]
ui/gtk/decode_as_dlg.c [moved from gtk/decode_as_dlg.c with 99% similarity]
ui/gtk/decode_as_dlg.h [moved from gtk/decode_as_dlg.h with 100% similarity]
ui/gtk/dfilter_expr_dlg.c [moved from gtk/dfilter_expr_dlg.c with 99% similarity]
ui/gtk/dfilter_expr_dlg.h [moved from gtk/dfilter_expr_dlg.h with 100% similarity]
ui/gtk/diameter_stat.c [moved from gtk/diameter_stat.c with 96% similarity]
ui/gtk/dissector_tables_dlg.c [moved from gtk/dissector_tables_dlg.c with 99% similarity]
ui/gtk/dissector_tables_dlg.h [moved from gtk/dissector_tables_dlg.h with 100% similarity]
ui/gtk/dlg_utils.c [moved from gtk/dlg_utils.c with 99% similarity]
ui/gtk/dlg_utils.h [moved from gtk/dlg_utils.h with 100% similarity]
ui/gtk/doxygen.cfg.in [moved from gtk/doxygen.cfg.in with 100% similarity]
ui/gtk/drag_and_drop.c [moved from gtk/drag_and_drop.c with 98% similarity]
ui/gtk/drag_and_drop.h [moved from gtk/drag_and_drop.h with 100% similarity]
ui/gtk/expert_comp_dlg.c [moved from gtk/expert_comp_dlg.c with 98% similarity]
ui/gtk/expert_comp_dlg.h [moved from gtk/expert_comp_dlg.h with 100% similarity]
ui/gtk/expert_comp_table.c [moved from gtk/expert_comp_table.c with 99% similarity]
ui/gtk/expert_comp_table.h [moved from gtk/expert_comp_table.h with 100% similarity]
ui/gtk/expert_indicators.h [moved from gtk/expert_indicators.h with 100% similarity]
ui/gtk/export_object.c [moved from gtk/export_object.c with 98% similarity]
ui/gtk/export_object.h [moved from gtk/export_object.h with 100% similarity]
ui/gtk/export_object_dicom.c [moved from gtk/export_object_dicom.c with 98% similarity]
ui/gtk/export_object_http.c [moved from gtk/export_object_http.c with 98% similarity]
ui/gtk/export_object_smb.c [moved from gtk/export_object_smb.c with 99% similarity]
ui/gtk/export_sslkeys.c [moved from gtk/export_sslkeys.c with 95% similarity]
ui/gtk/export_sslkeys.h [moved from gtk/export_sslkeys.h with 100% similarity]
ui/gtk/fc_stat.c [moved from gtk/fc_stat.c with 95% similarity]
ui/gtk/file_dlg.c [moved from gtk/file_dlg.c with 98% similarity]
ui/gtk/file_dlg.h [moved from gtk/file_dlg.h with 100% similarity]
ui/gtk/file_import_dlg.c [moved from gtk/file_import_dlg.c with 99% similarity]
ui/gtk/file_import_dlg.h [moved from gtk/file_import_dlg.h with 100% similarity]
ui/gtk/fileset_dlg.c [moved from gtk/fileset_dlg.c with 98% similarity]
ui/gtk/fileset_dlg.h [moved from gtk/fileset_dlg.h with 100% similarity]
ui/gtk/filter_autocomplete.c [moved from gtk/filter_autocomplete.c with 99% similarity]
ui/gtk/filter_autocomplete.h [moved from gtk/filter_autocomplete.h with 100% similarity]
ui/gtk/filter_dlg.c [moved from gtk/filter_dlg.c with 99% similarity]
ui/gtk/filter_dlg.h [moved from gtk/filter_dlg.h with 100% similarity]
ui/gtk/filter_expression_save_dlg.c [moved from gtk/filter_expression_save_dlg.c with 97% similarity]
ui/gtk/filter_expression_save_dlg.h [moved from gtk/filter_expression_save_dlg.h with 100% similarity]
ui/gtk/filter_utils.c [moved from gtk/filter_utils.c with 94% similarity]
ui/gtk/filter_utils.h [moved from gtk/filter_utils.h with 100% similarity]
ui/gtk/find_dlg.c [moved from gtk/find_dlg.c with 98% similarity]
ui/gtk/find_dlg.h [moved from gtk/find_dlg.h with 100% similarity]
ui/gtk/firewall_dlg.c [moved from gtk/firewall_dlg.c with 99% similarity]
ui/gtk/firewall_dlg.h [moved from gtk/firewall_dlg.h with 100% similarity]
ui/gtk/flow_graph.c [moved from gtk/flow_graph.c with 98% similarity]
ui/gtk/follow_ssl.c [moved from gtk/follow_ssl.c with 97% similarity]
ui/gtk/follow_ssl.h [moved from gtk/follow_ssl.h with 100% similarity]
ui/gtk/follow_stream.c [moved from gtk/follow_stream.c with 99% similarity]
ui/gtk/follow_stream.h [moved from gtk/follow_stream.h with 100% similarity]
ui/gtk/follow_tcp.c [moved from gtk/follow_tcp.c with 97% similarity]
ui/gtk/follow_tcp.h [moved from gtk/follow_tcp.h with 100% similarity]
ui/gtk/follow_udp.c [moved from gtk/follow_udp.c with 98% similarity]
ui/gtk/follow_udp.h [moved from gtk/follow_udp.h with 100% similarity]
ui/gtk/font_utils.c [moved from gtk/font_utils.c with 98% similarity]
ui/gtk/font_utils.h [moved from gtk/font_utils.h with 100% similarity]
ui/gtk/funnel_stat.c [moved from gtk/funnel_stat.c with 98% similarity]
ui/gtk/goto_dlg.c [moved from gtk/goto_dlg.c with 97% similarity]
ui/gtk/goto_dlg.h [moved from gtk/goto_dlg.h with 100% similarity]
ui/gtk/graph_analysis.c [moved from gtk/graph_analysis.c with 99% similarity]
ui/gtk/graph_analysis.h [moved from gtk/graph_analysis.h with 100% similarity]
ui/gtk/gsm_a_stat.c [moved from gtk/gsm_a_stat.c with 99% similarity]
ui/gtk/gsm_map_stat.c [moved from gtk/gsm_map_stat.c with 98% similarity]
ui/gtk/gsm_map_stat.h [moved from gtk/gsm_map_stat.h with 100% similarity]
ui/gtk/gsm_map_summary.c [moved from gtk/gsm_map_summary.c with 98% similarity]
ui/gtk/gtkglobals.h [moved from gtk/gtkglobals.h with 100% similarity]
ui/gtk/gtp_stat.c [moved from gtk/gtp_stat.c with 96% similarity]
ui/gtk/gui_stat_menu.h [moved from gtk/gui_stat_menu.h with 100% similarity]
ui/gtk/gui_stat_util.c [moved from gtk/gui_stat_util.c with 99% similarity]
ui/gtk/gui_stat_util.h [moved from gtk/gui_stat_util.h with 100% similarity]
ui/gtk/gui_utils.c [moved from gtk/gui_utils.c with 99% similarity]
ui/gtk/gui_utils.h [moved from gtk/gui_utils.h with 100% similarity]
ui/gtk/h225_counter.c [moved from gtk/h225_counter.c with 98% similarity]
ui/gtk/h225_ras_srt.c [moved from gtk/h225_ras_srt.c with 97% similarity]
ui/gtk/help_dlg.c [moved from gtk/help_dlg.c with 98% similarity]
ui/gtk/help_dlg.h [moved from gtk/help_dlg.h with 100% similarity]
ui/gtk/hostlist_eth.c [moved from gtk/hostlist_eth.c with 97% similarity]
ui/gtk/hostlist_fc.c [moved from gtk/hostlist_fc.c with 97% similarity]
ui/gtk/hostlist_fddi.c [moved from gtk/hostlist_fddi.c with 97% similarity]
ui/gtk/hostlist_ip.c [moved from gtk/hostlist_ip.c with 97% similarity]
ui/gtk/hostlist_ipv6.c [moved from gtk/hostlist_ipv6.c with 97% similarity]
ui/gtk/hostlist_ipx.c [moved from gtk/hostlist_ipx.c with 97% similarity]
ui/gtk/hostlist_jxta.c [moved from gtk/hostlist_jxta.c with 97% similarity]
ui/gtk/hostlist_ncp.c [moved from gtk/hostlist_ncp.c with 97% similarity]
ui/gtk/hostlist_rsvp.c [moved from gtk/hostlist_rsvp.c with 97% similarity]
ui/gtk/hostlist_sctp.c [moved from gtk/hostlist_sctp.c with 97% similarity]
ui/gtk/hostlist_table.c [moved from gtk/hostlist_table.c with 99% similarity]
ui/gtk/hostlist_table.h [moved from gtk/hostlist_table.h with 100% similarity]
ui/gtk/hostlist_tcpip.c [moved from gtk/hostlist_tcpip.c with 97% similarity]
ui/gtk/hostlist_tr.c [moved from gtk/hostlist_tr.c with 97% similarity]
ui/gtk/hostlist_udpip.c [moved from gtk/hostlist_udpip.c with 97% similarity]
ui/gtk/hostlist_usb.c [moved from gtk/hostlist_usb.c with 97% similarity]
ui/gtk/hostlist_wlan.c [moved from gtk/hostlist_wlan.c with 97% similarity]
ui/gtk/iax2_analysis.c [moved from gtk/iax2_analysis.c with 99% similarity]
ui/gtk/iax2_analysis.h [moved from gtk/iax2_analysis.h with 100% similarity]
ui/gtk/io_stat.c [moved from gtk/io_stat.c with 99% similarity]
ui/gtk/keys.h [moved from gtk/keys.h with 100% similarity]
ui/gtk/ldap_stat.c [moved from gtk/ldap_stat.c with 96% similarity]
ui/gtk/libui.vcproj [moved from gtk/libui.vcproj with 100% similarity]
ui/gtk/mac_lte_stat_dlg.c [moved from gtk/mac_lte_stat_dlg.c with 99% similarity]
ui/gtk/macros_dlg.c [moved from gtk/macros_dlg.c with 94% similarity]
ui/gtk/macros_dlg.h [moved from gtk/macros_dlg.h with 100% similarity]
ui/gtk/main.c [moved from gtk/main.c with 99% similarity]
ui/gtk/main.h [moved from gtk/main.h with 100% similarity]
ui/gtk/main_airpcap_toolbar.c [moved from gtk/main_airpcap_toolbar.c with 99% similarity]
ui/gtk/main_airpcap_toolbar.h [moved from gtk/main_airpcap_toolbar.h with 100% similarity]
ui/gtk/main_filter_toolbar.c [moved from gtk/main_filter_toolbar.c with 99% similarity]
ui/gtk/main_filter_toolbar.h [moved from gtk/main_filter_toolbar.h with 100% similarity]
ui/gtk/main_menubar.c [moved from gtk/main_menubar.c with 99% similarity]
ui/gtk/main_proto_draw.c [moved from gtk/main_proto_draw.c with 99% similarity]
ui/gtk/main_proto_draw.h [moved from gtk/main_proto_draw.h with 100% similarity]
ui/gtk/main_statusbar.c [moved from gtk/main_statusbar.c with 98% similarity]
ui/gtk/main_statusbar_private.h [moved from gtk/main_statusbar_private.h with 100% similarity]
ui/gtk/main_toolbar.c [moved from gtk/main_toolbar.c with 96% similarity]
ui/gtk/main_toolbar.h [moved from gtk/main_toolbar.h with 100% similarity]
ui/gtk/main_welcome.c [moved from gtk/main_welcome.c with 99% similarity]
ui/gtk/main_welcome.h [moved from gtk/main_welcome.h with 98% similarity]
ui/gtk/manual_addr_resolv.c [moved from gtk/manual_addr_resolv.c with 96% similarity]
ui/gtk/manual_addr_resolv.h [moved from gtk/manual_addr_resolv.h with 100% similarity]
ui/gtk/mcast_stream.c [moved from gtk/mcast_stream.c with 99% similarity]
ui/gtk/mcast_stream.h [moved from gtk/mcast_stream.h with 100% similarity]
ui/gtk/mcast_stream_dlg.c [moved from gtk/mcast_stream_dlg.c with 99% similarity]
ui/gtk/mcast_stream_dlg.h [moved from gtk/mcast_stream_dlg.h with 100% similarity]
ui/gtk/megaco_stat.c [moved from gtk/megaco_stat.c with 97% similarity]
ui/gtk/menus.h [moved from gtk/menus.h with 100% similarity]
ui/gtk/mgcp_stat.c [moved from gtk/mgcp_stat.c with 97% similarity]
ui/gtk/mtp3_stat.c [moved from gtk/mtp3_stat.c with 98% similarity]
ui/gtk/mtp3_stat.h [moved from gtk/mtp3_stat.h with 100% similarity]
ui/gtk/mtp3_summary.c [moved from gtk/mtp3_summary.c with 99% similarity]
ui/gtk/ncp_stat.c [moved from gtk/ncp_stat.c with 99% similarity]
ui/gtk/network_icons.h [moved from gtk/network_icons.h with 100% similarity]
ui/gtk/new_packet_list.c [moved from gtk/new_packet_list.c with 98% similarity]
ui/gtk/new_packet_list.h [moved from gtk/new_packet_list.h with 100% similarity]
ui/gtk/old-gtk-compat.h [moved from gtk/old-gtk-compat.h with 100% similarity]
ui/gtk/packet_history.c [moved from gtk/packet_history.c with 98% similarity]
ui/gtk/packet_history.h [moved from gtk/packet_history.h with 100% similarity]
ui/gtk/packet_list_store.c [moved from gtk/packet_list_store.c with 100% similarity]
ui/gtk/packet_list_store.h [moved from gtk/packet_list_store.h with 100% similarity]
ui/gtk/packet_win.c [moved from gtk/packet_win.c with 99% similarity]
ui/gtk/packet_win.h [moved from gtk/packet_win.h with 100% similarity]
ui/gtk/pixmap_save.c [moved from gtk/pixmap_save.c with 97% similarity]
ui/gtk/pixmap_save.h [moved from gtk/pixmap_save.h with 100% similarity]
ui/gtk/plugins_dlg.c [moved from gtk/plugins_dlg.c with 97% similarity]
ui/gtk/plugins_dlg.h [moved from gtk/plugins_dlg.h with 100% similarity]
ui/gtk/prefs_capture.c [moved from gtk/prefs_capture.c with 99% similarity]
ui/gtk/prefs_capture.h [moved from gtk/prefs_capture.h with 100% similarity]
ui/gtk/prefs_column.c [moved from gtk/prefs_column.c with 99% similarity]
ui/gtk/prefs_column.h [moved from gtk/prefs_column.h with 100% similarity]
ui/gtk/prefs_dlg.c [moved from gtk/prefs_dlg.c with 98% similarity]
ui/gtk/prefs_dlg.h [moved from gtk/prefs_dlg.h with 100% similarity]
ui/gtk/prefs_filter_expressions.c [moved from gtk/prefs_filter_expressions.c with 98% similarity]
ui/gtk/prefs_filter_expressions.h [moved from gtk/prefs_filter_expressions.h with 100% similarity]
ui/gtk/prefs_gui.c [moved from gtk/prefs_gui.c with 98% similarity]
ui/gtk/prefs_gui.h [moved from gtk/prefs_gui.h with 100% similarity]
ui/gtk/prefs_layout.c [moved from gtk/prefs_layout.c with 99% similarity]
ui/gtk/prefs_layout.h [moved from gtk/prefs_layout.h with 100% similarity]
ui/gtk/prefs_nameres.c [moved from gtk/prefs_nameres.c with 98% similarity]
ui/gtk/prefs_nameres.h [moved from gtk/prefs_nameres.h with 100% similarity]
ui/gtk/prefs_print.c [moved from gtk/prefs_print.c with 95% similarity]
ui/gtk/prefs_print.h [moved from gtk/prefs_print.h with 100% similarity]
ui/gtk/prefs_protocols.c [moved from gtk/prefs_protocols.c with 97% similarity]
ui/gtk/prefs_protocols.h [moved from gtk/prefs_protocols.h with 100% similarity]
ui/gtk/prefs_stream.c [moved from gtk/prefs_stream.c with 98% similarity]
ui/gtk/prefs_stream.h [moved from gtk/prefs_stream.h with 100% similarity]
ui/gtk/prefs_taps.c [moved from gtk/prefs_taps.c with 98% similarity]
ui/gtk/prefs_taps.h [moved from gtk/prefs_taps.h with 100% similarity]
ui/gtk/print_dlg.c [moved from gtk/print_dlg.c with 99% similarity]
ui/gtk/profile_dlg.c [moved from gtk/profile_dlg.c with 99% similarity]
ui/gtk/profile_dlg.h [moved from gtk/profile_dlg.h with 100% similarity]
ui/gtk/progress_dlg.c [moved from gtk/progress_dlg.c with 99% similarity]
ui/gtk/proto_dlg.c [moved from gtk/proto_dlg.c with 99% similarity]
ui/gtk/proto_dlg.h [moved from gtk/proto_dlg.h with 100% similarity]
ui/gtk/proto_help.c [moved from gtk/proto_help.c with 99% similarity]
ui/gtk/proto_help.h [moved from gtk/proto_help.h with 100% similarity]
ui/gtk/proto_hier_stats_dlg.c [moved from gtk/proto_hier_stats_dlg.c with 99% similarity]
ui/gtk/proto_hier_stats_dlg.h [moved from gtk/proto_hier_stats_dlg.h with 100% similarity]
ui/gtk/radius_stat.c [moved from gtk/radius_stat.c with 98% similarity]
ui/gtk/range_utils.c [moved from gtk/range_utils.c with 99% similarity]
ui/gtk/range_utils.h [moved from gtk/range_utils.h with 100% similarity]
ui/gtk/recent.c [moved from gtk/recent.c with 99% similarity]
ui/gtk/recent.h [moved from gtk/recent.h with 100% similarity]
ui/gtk/remote_icons.h [moved from gtk/remote_icons.h with 100% similarity]
ui/gtk/rlc_lte_stat_dlg.c [moved from gtk/rlc_lte_stat_dlg.c with 99% similarity]
ui/gtk/rpc_progs.c [moved from gtk/rpc_progs.c with 98% similarity]
ui/gtk/rpc_stat.c [moved from gtk/rpc_stat.c with 97% similarity]
ui/gtk/rtp_analysis.c [moved from gtk/rtp_analysis.c with 99% similarity]
ui/gtk/rtp_analysis.h [moved from gtk/rtp_analysis.h with 100% similarity]
ui/gtk/rtp_player.c [moved from gtk/rtp_player.c with 99% similarity]
ui/gtk/rtp_player.h [moved from gtk/rtp_player.h with 100% similarity]
ui/gtk/rtp_stream.c [moved from gtk/rtp_stream.c with 98% similarity]
ui/gtk/rtp_stream.h [moved from gtk/rtp_stream.h with 100% similarity]
ui/gtk/rtp_stream_dlg.c [moved from gtk/rtp_stream_dlg.c with 99% similarity]
ui/gtk/rtp_stream_dlg.h [moved from gtk/rtp_stream_dlg.h with 100% similarity]
ui/gtk/sat.h [moved from gtk/sat.h with 100% similarity]
ui/gtk/scsi_stat.c [moved from gtk/scsi_stat.c with 96% similarity]
ui/gtk/sctp_assoc_analyse.c [moved from gtk/sctp_assoc_analyse.c with 99% similarity]
ui/gtk/sctp_byte_graph_dlg.c [moved from gtk/sctp_byte_graph_dlg.c with 99% similarity]
ui/gtk/sctp_chunk_stat.c [moved from gtk/sctp_chunk_stat.c with 97% similarity]
ui/gtk/sctp_chunk_stat_dlg.c [moved from gtk/sctp_chunk_stat_dlg.c with 99% similarity]
ui/gtk/sctp_error_dlg.c [moved from gtk/sctp_error_dlg.c with 98% similarity]
ui/gtk/sctp_graph_dlg.c [moved from gtk/sctp_graph_dlg.c with 99% similarity]
ui/gtk/sctp_stat.c [moved from gtk/sctp_stat.c with 99% similarity]
ui/gtk/sctp_stat.h [moved from gtk/sctp_stat.h with 100% similarity]
ui/gtk/sctp_stat_dlg.c [moved from gtk/sctp_stat_dlg.c with 98% similarity]
ui/gtk/service_response_time_table.c [moved from gtk/service_response_time_table.c with 99% similarity]
ui/gtk/service_response_time_table.h [moved from gtk/service_response_time_table.h with 100% similarity]
ui/gtk/simple_dialog.c [moved from gtk/simple_dialog.c with 98% similarity]
ui/gtk/sip_stat.c [moved from gtk/sip_stat.c with 99% similarity]
ui/gtk/smb2_stat.c [moved from gtk/smb2_stat.c with 95% similarity]
ui/gtk/smb_stat.c [moved from gtk/smb_stat.c with 96% similarity]
ui/gtk/stats_tree_stat.c [moved from gtk/stats_tree_stat.c with 98% similarity]
ui/gtk/stock_icons.c [moved from gtk/stock_icons.c with 99% similarity]
ui/gtk/stock_icons.h [moved from gtk/stock_icons.h with 100% similarity]
ui/gtk/summary_dlg.c [moved from gtk/summary_dlg.c with 98% similarity]
ui/gtk/summary_dlg.h [moved from gtk/summary_dlg.h with 100% similarity]
ui/gtk/supported_protos_dlg.c [moved from gtk/supported_protos_dlg.c with 98% similarity]
ui/gtk/supported_protos_dlg.h [moved from gtk/supported_protos_dlg.h with 100% similarity]
ui/gtk/tap_param_dlg.c [moved from gtk/tap_param_dlg.c with 97% similarity]
ui/gtk/tap_param_dlg.h [moved from gtk/tap_param_dlg.h with 100% similarity]
ui/gtk/tcp_graph.c [moved from gtk/tcp_graph.c with 99% similarity]
ui/gtk/text_import.c [moved from gtk/text_import.c with 100% similarity]
ui/gtk/text_import.h [moved from gtk/text_import.h with 100% similarity]
ui/gtk/text_import_scanner.h [moved from gtk/text_import_scanner.h with 100% similarity]
ui/gtk/text_import_scanner.l [moved from gtk/text_import_scanner.l with 100% similarity]
ui/gtk/text_page_utils.c [moved from gtk/text_page_utils.c with 97% similarity]
ui/gtk/text_page_utils.h [moved from gtk/text_page_utils.h with 100% similarity]
ui/gtk/time_shift_dlg.c [moved from gtk/time_shift_dlg.c with 99% similarity]
ui/gtk/time_shift_dlg.h [moved from gtk/time_shift_dlg.h with 100% similarity]
ui/gtk/uat_gui.c [moved from gtk/uat_gui.c with 99% similarity]
ui/gtk/uat_gui.h [moved from gtk/uat_gui.h with 100% similarity]
ui/gtk/ui/main-menubar-ui.xml [moved from gtk/ui/main-menubar-ui.xml with 100% similarity]
ui/gtk/utf8_entities.h [moved from gtk/utf8_entities.h with 100% similarity]
ui/gtk/voip_calls.c [moved from gtk/voip_calls.c with 99% similarity]
ui/gtk/voip_calls.h [moved from gtk/voip_calls.h with 100% similarity]
ui/gtk/voip_calls_dlg.c [moved from gtk/voip_calls_dlg.c with 98% similarity]
ui/gtk/voip_calls_dlg.h [moved from gtk/voip_calls_dlg.h with 100% similarity]
ui/gtk/webbrowser.c [moved from gtk/webbrowser.c with 99% similarity]
ui/gtk/webbrowser.h [moved from gtk/webbrowser.h with 100% similarity]
ui/gtk/wlan_stat_dlg.c [moved from gtk/wlan_stat_dlg.c with 99% similarity]
ui/gtk/wsp_stat.c [moved from gtk/wsp_stat.c with 98% similarity]
ui/qt/QtShark.pro
ui/qt/capture_interface_dialog.cpp
ui/qt/display_filter_combo.cpp
ui/qt/display_filter_edit.cpp
ui/qt/interface_tree.cpp
ui/qt/main.cpp
ui/qt/main_window.cpp
ui/qt/packet_list.cpp
ui/qt/qt_ui_utils.cpp
ui/qt/qt_ui_utils.h
ui/qt/wireshark_application.cpp
win32/file_dlg_win32.c

index c77d4eb9a818c5c34245c621e3d2ee4c3558e043..fbab9e57432c629bc2f495ea00dbaf636daeba7f 100644 (file)
@@ -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
index cd75fc964ca292ea868b4211d22251941d9f2aa1..4da0e668ab829774334f8d11bb4174e10a7e9384 100644 (file)
@@ -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
index 9ab5d339d5b202bc237ca2e084beca2023d2446f..bde86a74f696d074b1c64b6de09dc38ca23d4fcf 100644 (file)
@@ -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
index 225c78831113e7b0d1fa799ba2165c02050a48e3..a9c135ddf3fa2c712c7c6be55fcce56a4f3df2c5 100644 (file)
@@ -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
index 4e94a73fcc11cc42031896818edfa0b4dfd01938..2e8e863fa2fab383b755dae0a3311ca162fa3287 100644 (file)
@@ -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)
index 494e6df863581b2bbb20ae0a4853521046726157..35a4e25ca4e6b25b8147f5531821c4a0cf6a3b0c 100644 (file)
@@ -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;
 
diff --git a/file.c b/file.c
index 5ca617424e0e12ddace22978d3f835e882cab20a..3777aca2fc9ad38bca98054789a88ef143e1858a 100644 (file)
--- a/file.c
+++ b/file.c
@@ -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
index 82f484a1c20d65e18071bad43d67df705005206b..2e9b3af4c8296f0ce69d305b2afd8427fc5dc585 100644 (file)
@@ -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
 
 ;
index 6bbf16a3a689464930910501ef6e33f1f390af47..0a73ddc006e383d4f37db2ca8298120de4189f2f 100644 (file)
@@ -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: \
index 8efbc06ef9a9cc4a5876ea0b0ddd58fb26d6c3ed..206fd61db04733005520ddf6501f481ff743411b 100644 (file)
@@ -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
index 3ad22e268930b96b8e1266b021f17402e14da9f4..8c040180a80d932671e530acf55d46dba968be0a 100644 (file)
@@ -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*);
index 5b73b01d8f44f61c4f3ef9872b2741a3fa208033..2741ea84b7584a13dd0cdf6488254f7d920443a6 100644 (file)
--- a/tap-rtp.c
+++ b/tap-rtp.c
@@ -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>
  *
index 5d545b66f13e76e6f20c16a4966038f266fa45f2..b8273219baef0d3dc8da84210d0cfc214bef3f55 100644 (file)
@@ -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 */
similarity index 100%
rename from gtk/CMakeLists.txt
rename to ui/gtk/CMakeLists.txt
similarity index 100%
rename from gtk/Makefile.am
rename to ui/gtk/Makefile.am
similarity index 100%
rename from gtk/Makefile.common
rename to ui/gtk/Makefile.common
similarity index 100%
rename from gtk/Makefile.nmake
rename to ui/gtk/Makefile.nmake
similarity index 90%
rename from gtk/STATUS.gtk3
rename to ui/gtk/STATUS.gtk3
index 88af5daf7c1b3e1882e7d88c9a9e39b2a016a92c..58999d87ed6c17f51e23d41a9c3ca98a1bc564cf 100644 (file)
@@ -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
similarity index 98%
rename from gtk/about_dlg.c
rename to ui/gtk/about_dlg.c
index 682ed8f032c71e16bf9615d3faa7b8f917116ddc..d0e0f228be9c5478f0c45f4adf50a61e039b4e1d 100644 (file)
 #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"
similarity index 100%
rename from gtk/about_dlg.h
rename to ui/gtk/about_dlg.h
similarity index 96%
rename from gtk/afp_stat.c
rename to ui/gtk/afp_stat.c
index ec727cd24bbbea8ca896a9935733d652e33a1743..f0da6e1d6eec97659ebf1e37111e961fb337d437 100644 (file)
 #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 {
similarity index 99%
rename from gtk/airpcap_dlg.c
rename to ui/gtk/airpcap_dlg.c
index 16bda59517d5102349678c13e9d15d75877db79c..0ab3d717fbcff38799662e490bc710e3ada130b6 100644 (file)
 
 #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"
similarity index 100%
rename from gtk/airpcap_dlg.h
rename to ui/gtk/airpcap_dlg.h
similarity index 99%
rename from gtk/airpcap_gui_utils.c
rename to ui/gtk/airpcap_gui_utils.c
index 1887adf1700b4645e006d32d7e4110cce69f95a3..9e2902fb8db7d96669275c9482bb3265d9291a81 100644 (file)
 
 #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"
similarity index 98%
rename from gtk/ansi_a_stat.c
rename to ui/gtk/ansi_a_stat.c
index 40fa4bd5b92f5c41e649e6cb4bffa9b52199bf56..8b1eccd9e8fbd931ab7eef1b37b222e1aee6383f 100644 (file)
 #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
 {
similarity index 98%
rename from gtk/ansi_map_stat.c
rename to ui/gtk/ansi_map_stat.c
index 14511c80eb34474e0afdbe8d9c857201594c4803..893707bcbcb182a6bb3a0db501b9199d8268addf 100644 (file)
 #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
 {
similarity index 98%
rename from gtk/bootp_stat.c
rename to ui/gtk/bootp_stat.c
index db8af363971958b1e96434b357e1edd66cdafddd..5b4e9f7c6af51b993ee939626f0919ca7c441ae7 100644 (file)
 #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;
 
similarity index 97%
rename from gtk/camel_counter.c
rename to ui/gtk/camel_counter.c
index f8f8ba2a188bc3ea8da9a05d2cc46249633868f4..66c3dd4d951da1ef582beffe2fa8cccdc2dbfd56 100644 (file)
 #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,
similarity index 96%
rename from gtk/camel_srt.c
rename to ui/gtk/camel_srt.c
index d2cd3637d7a53eb7d4479671829e6a112b8a8976..6b0546e72844d5027959abb58898232f1cbe9660 100644 (file)
 #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 {
similarity index 99%
rename from gtk/capture_dlg.c
rename to ui/gtk/capture_dlg.c
index 26d98c39f0ff146e2d819b603c7fbe968f185cf1..9e3b1dd1748f5d48909debad596fc675b74deefd 100644 (file)
 #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>
similarity index 100%
rename from gtk/capture_dlg.h
rename to ui/gtk/capture_dlg.h
similarity index 99%
rename from gtk/capture_file_dlg.c
rename to ui/gtk/capture_file_dlg.c
index 45f08bd6cf8b37bcbcaa6d8717a7fef02f06315f..4a2a6c1ed7ed6ac578c5cef390d5c712c19ec46a 100644 (file)
 #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>
similarity index 99%
rename from gtk/capture_if_details_dlg_win32.c
rename to ui/gtk/capture_if_details_dlg_win32.c
index f66e80de610fa66cb787fae559c3cbcfc286270d..c941d121a2e41bb55fe1057f67dac5312d89afa3 100644 (file)
 #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.  */
similarity index 98%
rename from gtk/capture_if_dlg.c
rename to ui/gtk/capture_if_dlg.c
index 02cd06a4632df0a4a5226129a7072a0e88bba6bb..958e8cbae543795897a152f99aa75014135b951b 100644 (file)
 #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
similarity index 100%
rename from gtk/capture_if_dlg.h
rename to ui/gtk/capture_if_dlg.h
similarity index 98%
rename from gtk/capture_info_dlg.c
rename to ui/gtk/capture_info_dlg.c
index 6a209fe4f25c88bc5be8201885d6f02b24826f65..d99724fc510cc87d39ef3b2920b196f1a32d8fbf 100644 (file)
 #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>
similarity index 95%
rename from gtk/cfilter_combo_utils.c
rename to ui/gtk/cfilter_combo_utils.c
index e7fc5ca3ffc7107205a9cc42b8f4d510400e600c..67cfcff6bf485d3dc988d0c941d8fdfba3ec3fc5 100644 (file)
 
 #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! */
similarity index 98%
rename from gtk/color_dlg.c
rename to ui/gtk/color_dlg.c
index 91135bc108fe63b60eb40b60c8db80300c6586c3..0f3ee92558f9986292af6c2adc2388ca8e6e5ba8 100644 (file)
 #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
similarity index 100%
rename from gtk/color_dlg.h
rename to ui/gtk/color_dlg.h
similarity index 98%
rename from gtk/color_edit_dlg.c
rename to ui/gtk/color_edit_dlg.c
index 2e47bcb46df87499724b2cf984e5843024f8c83e..77cb2fa23eb62c011fd34726df2afa7cfc2334db 100644 (file)
 #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
similarity index 100%
rename from gtk/color_edit_dlg.h
rename to ui/gtk/color_edit_dlg.h
similarity index 98%
rename from gtk/color_utils.c
rename to ui/gtk/color_utils.c
index abd15896fe27bbfeca7451dc5dd157442eb739bd..7e2d9243ed2b43f0654652b5c0761c650c7dd22b 100644 (file)
@@ -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;
similarity index 100%
rename from gtk/color_utils.h
rename to ui/gtk/color_utils.h
similarity index 99%
rename from gtk/compare_stat.c
rename to ui/gtk/compare_stat.c
index c0f3b953258729768c553b702221bbdf04aae575..ea487c49643a2254c4940fc41a2ce5188943cdf7 100644 (file)
 #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
similarity index 96%
rename from gtk/conversations_eth.c
rename to ui/gtk/conversations_eth.c
index 664a1d50c047a6224b7d040fc84b7225adf1dc04..336578d2f08a65dda9ed9956ffb92f5c8a94677c 100644 (file)
@@ -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)
similarity index 96%
rename from gtk/conversations_fc.c
rename to ui/gtk/conversations_fc.c
index a816ee29faba0f9c9eb36410e9eccfe80c5aedcf..f1e0b3c58f7dde617ef50662ee77f52176de525f 100644 (file)
@@ -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
similarity index 96%
rename from gtk/conversations_fddi.c
rename to ui/gtk/conversations_fddi.c
index a0a2028450b11e5790a8c791c90ed554597bb3e9..fcd721b6a1906feb09bf71ae95528ee60ed567bb 100644 (file)
@@ -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)
similarity index 96%
rename from gtk/conversations_ip.c
rename to ui/gtk/conversations_ip.c
index f64a033b72d7b21c724b7fadc24702232d5ad18c..d77fb5c6a8e1b2ed61f98277b38cd308f9cb764d 100644 (file)
@@ -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)
similarity index 97%
rename from gtk/conversations_ipv6.c
rename to ui/gtk/conversations_ipv6.c
index 8f1a94d9973b60cbd04b304d5cb471cb7b707d4a..83e9585e4234da15b902b08c9414e3b95f33faf9 100644 (file)
@@ -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)
similarity index 96%
rename from gtk/conversations_ipx.c
rename to ui/gtk/conversations_ipx.c
index 05cb2bf8710122312ba0f699757ed0d65137a5a3..481e5a6d48694df22aff089bef91a86f34418d5d 100644 (file)
@@ -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
similarity index 96%
rename from gtk/conversations_jxta.c
rename to ui/gtk/conversations_jxta.c
index 82cd28b2f5828404aad3d09620a37f65f1f516ed..e56ac0e1181a48a5926dc9f57a21f30d32d3e8c6 100644 (file)
@@ -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)
similarity index 96%
rename from gtk/conversations_ncp.c
rename to ui/gtk/conversations_ncp.c
index 95501cc60db7a18cf02976521160e31a57710812..058da489ab2f76ce0460c397499d23ee9147cc32 100644 (file)
@@ -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)
similarity index 96%
rename from gtk/conversations_rsvp.c
rename to ui/gtk/conversations_rsvp.c
index 82bc7b7cb5bcff3d29996a7f875b93ca47c660c3..a5ddf2b3c8ceb0a84501a53c01db41e0c7cebb5f 100644 (file)
@@ -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)
similarity index 96%
rename from gtk/conversations_sctp.c
rename to ui/gtk/conversations_sctp.c
index a835588167e8a31dff38878a315d8bd9829ccbca..e7c5379ea5e19bfe32f0e371c67d0792541dad71 100644 (file)
@@ -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)
similarity index 99%
rename from gtk/conversations_table.c
rename to ui/gtk/conversations_table.c
index bd677d0b2642a9052fc7e42ca2d3d2b4c2b0ecca..5573b8162a567be56bfc5530fbe19f0dfe155e68 100644 (file)
 #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"
 
similarity index 96%
rename from gtk/conversations_tcpip.c
rename to ui/gtk/conversations_tcpip.c
index 2f250f1561c0c075d068ba6a9a35915fc6e64381..ce5f02b65a6be1f6811bd0bb3c30c773d7af06a1 100644 (file)
@@ -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)
similarity index 96%
rename from gtk/conversations_tr.c
rename to ui/gtk/conversations_tr.c
index bddda858812b02e28d2754e0f64f941ab7a98fd4..13f8306872017b5cab2fb1f663f205d895d6f727 100644 (file)
@@ -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)
similarity index 96%
rename from gtk/conversations_udpip.c
rename to ui/gtk/conversations_udpip.c
index d12d631e24d193bd1dd8f026eb6545f1ec1b2372..34360c0376525931ba6ce344a5c9c543396be07d 100644 (file)
@@ -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)
similarity index 96%
rename from gtk/conversations_usb.c
rename to ui/gtk/conversations_usb.c
index 16004ae9af6a0d55240b1d9f53a33f87b7703f75..2bd4af3c5aa2e46fc85641ad649c513c1f626eed 100644 (file)
@@ -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_)
similarity index 96%
rename from gtk/conversations_wlan.c
rename to ui/gtk/conversations_wlan.c
index 5d9383df2ff6cc231550c6ade6b8b80be1c5c11e..b4579cfbe1d2140cc142ba6992d3fd7da2e96d4b 100644 (file)
@@ -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)
similarity index 98%
rename from gtk/dcerpc_stat.c
rename to ui/gtk/dcerpc_stat.c
index 5255fec740be783f8b99a84057bc2d61620a0460..e44b5bc20b103319f67b4ad058efceafb6c83e75 100644 (file)
 #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 {
similarity index 96%
rename from gtk/decode_as_ber.c
rename to ui/gtk/decode_as_ber.c
index 228f2cc2524302484a0ef3c09f6f14cf6ae173d9..13d8131ccf9972f185e4bd7cce7f00d631a242d6 100644 (file)
 
 #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"
 
 
 /**************************************************/
similarity index 100%
rename from gtk/decode_as_ber.h
rename to ui/gtk/decode_as_ber.h
similarity index 98%
rename from gtk/decode_as_dcerpc.c
rename to ui/gtk/decode_as_dcerpc.c
index 6329480bee0c6f03e11e58d2b5447db997d02de9..202e73a8a7b0ff507069d2f1d4c6b77cdf34e053 100644 (file)
 
 #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"
 
 
 /**************************************************/
similarity index 99%
rename from gtk/decode_as_dlg.c
rename to ui/gtk/decode_as_dlg.c
index e79a0568a28e1b5ec629b370afc4b73494aa1888..8f954eeb3d54d5c7241d6e8bf5e8177d9f9eb78a 100644 (file)
 
 #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
similarity index 100%
rename from gtk/decode_as_dlg.h
rename to ui/gtk/decode_as_dlg.h
similarity index 99%
rename from gtk/dfilter_expr_dlg.c
rename to ui/gtk/dfilter_expr_dlg.c
index db43dc2f72ea4c8ea1d9f46fd71375efd09c43b8..da690b5a01ce56f9671a2a681d14939c56fc09ef 100644 (file)
 
 #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"
similarity index 96%
rename from gtk/diameter_stat.c
rename to ui/gtk/diameter_stat.c
index fb63a59dfe1e979c25a59f164e4eab174ff057a0..3c6733f588cd9c4b8afbce02583b31c3230caff0 100644 (file)
 #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 {
similarity index 99%
rename from gtk/dissector_tables_dlg.c
rename to ui/gtk/dissector_tables_dlg.c
index 324ea1d09e60b72985379f3eda5ac8b90b02012f..ce5c59a1cf714d3986e735eaca7fe398c378548a 100644 (file)
@@ -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;
 
similarity index 99%
rename from gtk/dlg_utils.c
rename to ui/gtk/dlg_utils.c
index 1f9cc89a7701a1865a1b22365dfaf723ec66ba7d..3a77689e0cae851a8dbdf741af912535e2d29cfb 100644 (file)
 
 #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"
 
similarity index 100%
rename from gtk/dlg_utils.h
rename to ui/gtk/dlg_utils.h
similarity index 100%
rename from gtk/doxygen.cfg.in
rename to ui/gtk/doxygen.cfg.in
similarity index 98%
rename from gtk/drag_and_drop.c
rename to ui/gtk/drag_and_drop.c
index e4ae20feef1bfe233190429b9c8812c593208167..43e2fb664cc0cbc1af2967669ca395bd002d0696 100644 (file)
 #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>
similarity index 100%
rename from gtk/drag_and_drop.h
rename to ui/gtk/drag_and_drop.h
similarity index 98%
rename from gtk/expert_comp_dlg.c
rename to ui/gtk/expert_comp_dlg.c
index 624c5a6629797ba83ebba8cf90c315c1740d3bfb..85fb78bcc42541a17908bbdb4718f505533be6e2 100644 (file)
 #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
 {
similarity index 99%
rename from gtk/expert_comp_table.c
rename to ui/gtk/expert_comp_table.c
index fde24724875c31808a7b3019133caf294d9dcac1..153ff83b6c248c14742a3d77d823043824b84c74 100644 (file)
 
 #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:";
 
similarity index 98%
rename from gtk/export_object.c
rename to ui/gtk/export_object.c
index 6ab62ec57a4a7c8e27091e0c16c060b1ad01a6b7..7d34fbbcf50cc6d734d9481c1c27d198a8bc2ff5 100644 (file)
 #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 {
similarity index 100%
rename from gtk/export_object.h
rename to ui/gtk/export_object.h
similarity index 98%
rename from gtk/export_object_dicom.c
rename to ui/gtk/export_object_dicom.c
index c9acc48a80db287802a67ff7d9347d8f717b68c8..3c7d0f4f46617185b7405eb54b1fa83a700e7485 100644 (file)
@@ -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_,
similarity index 98%
rename from gtk/export_object_http.c
rename to ui/gtk/export_object_http.c
index 9ad82a3ba4f4ed6e2bd7bcf0d3fd66f4c94ae6e7..5159b59f49724eeae0f820d05649d769bcd84d00 100644 (file)
@@ -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
similarity index 99%
rename from gtk/export_object_smb.c
rename to ui/gtk/export_object_smb.c
index 46684f75a918d60d00cbf289253f763c9d9111ac..e23411e56fcbf3ddc398bb99ab666abf73e067dd 100644 (file)
@@ -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
similarity index 95%
rename from gtk/export_sslkeys.c
rename to ui/gtk/export_sslkeys.c
index fbb61e699dcfb79a0e95606f27c94ceae45a456b..f31b6f6d6329afe0ddf8f71e3b420e2ba739a2c9 100644 (file)
 #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>
similarity index 100%
rename from gtk/export_sslkeys.h
rename to ui/gtk/export_sslkeys.h
similarity index 95%
rename from gtk/fc_stat.c
rename to ui/gtk/fc_stat.c
index 1cec78449aebbc3fdec6605ec07069f3949bb788..362b0e41cf29d0a74b7dc9c6cd84d91cbbd1ad8e 100644 (file)
 #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 {
similarity index 98%
rename from gtk/file_dlg.c
rename to ui/gtk/file_dlg.c
index e5e9e6410ee7b07dc563c0bcc0d2d0fe83b82fe1..0d57ddff6092f885483c8556735f5610550a019a 100644 (file)
 
 #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;
similarity index 100%
rename from gtk/file_dlg.h
rename to ui/gtk/file_dlg.h
similarity index 99%
rename from gtk/file_import_dlg.c
rename to ui/gtk/file_import_dlg.c
index 1d7535d81c24dc0b6c287ceff085fed7eca81019..b5a77358a608cb1215260e7d3c255a2ca6f377a2 100644 (file)
 #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"
similarity index 98%
rename from gtk/fileset_dlg.c
rename to ui/gtk/fileset_dlg.c
index c2900f4cf6f834e2a26b4d6dc5d0adc7d0f80b48..1684190587ddea6516a4900d153ef7c4bd49923e 100644 (file)
 #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"
 
 
 
similarity index 100%
rename from gtk/fileset_dlg.h
rename to ui/gtk/fileset_dlg.h
similarity index 99%
rename from gtk/filter_autocomplete.c
rename to ui/gtk/filter_autocomplete.c
index 7ebe2e4bac741e653468531c5f104d4533a70bb0..6a67b51eb83849dfeee94b718aeefebe032f1bc8 100644 (file)
 
 #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"
 
similarity index 99%
rename from gtk/filter_dlg.c
rename to ui/gtk/filter_dlg.c
index 3f6efade9c805a9946a93072442c554d0f4124dc..1349826b069c5e7b43721f5da7187da83ab58e1b 100644 (file)
 #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"
similarity index 100%
rename from gtk/filter_dlg.h
rename to ui/gtk/filter_dlg.h
similarity index 97%
rename from gtk/filter_expression_save_dlg.c
rename to ui/gtk/filter_expression_save_dlg.c
index 95ab006127bbb02c949bc26091bbdb07446e543d..aa9e693e63193188b7c23f3ea62c791d42b7f738 100644 (file)
 #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"
 
similarity index 94%
rename from gtk/filter_utils.c
rename to ui/gtk/filter_utils.c
index c69d13a6e7b6ee972703af216c5c1508b012f044..7aa30ccfbf0269788045ae359428802b103e43e7 100644 (file)
 #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)
similarity index 100%
rename from gtk/filter_utils.h
rename to ui/gtk/filter_utils.h
similarity index 98%
rename from gtk/find_dlg.c
rename to ui/gtk/find_dlg.c
index c87a98eeccb5d0a875da533ed339703764012394..c690f16dab4ecc3d23af2d38d57c00804a0d2dac 100644 (file)
 #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"
similarity index 100%
rename from gtk/find_dlg.h
rename to ui/gtk/find_dlg.h
similarity index 99%
rename from gtk/firewall_dlg.c
rename to ui/gtk/firewall_dlg.c
index 405f9ca552e0c261b705acb190b1464e223118d6..72ffcfa40557b3afc17a23d810522d24f7f97cb6 100644 (file)
 #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
 
similarity index 100%
rename from gtk/firewall_dlg.h
rename to ui/gtk/firewall_dlg.h
similarity index 98%
rename from gtk/flow_graph.c
rename to ui/gtk/flow_graph.c
index 3fb6b323881f06543a778ed2d78517fd53053799..f8b62adeae415cbe36d4c45ec58253e4b5d28863 100644 (file)
 #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"
 
 
 
similarity index 97%
rename from gtk/follow_ssl.c
rename to ui/gtk/follow_ssl.c
index 82bc680c87530a7e1b4c4a2a77a95427ce87d2c6..cee99305db935a6a43e2665769792d719b0f61d1 100644 (file)
 #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"
similarity index 100%
rename from gtk/follow_ssl.h
rename to ui/gtk/follow_ssl.h
similarity index 99%
rename from gtk/follow_stream.c
rename to ui/gtk/follow_stream.c
index c2bc5ee4ba8cd90a5324dbc115e4c8c28aa7876a..6e08ae280c3658f80454d40245a6333cdb4ea587 100644 (file)
 #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"
similarity index 100%
rename from gtk/follow_stream.h
rename to ui/gtk/follow_stream.h
similarity index 97%
rename from gtk/follow_tcp.c
rename to ui/gtk/follow_tcp.c
index abfe66b0883576179847ae86c8acfc76192e4a9d..ada4f65b55dd9ec47cc3ac60ad78fc492f4df875 100644 (file)
 #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;
similarity index 100%
rename from gtk/follow_tcp.h
rename to ui/gtk/follow_tcp.h
similarity index 98%
rename from gtk/follow_udp.c
rename to ui/gtk/follow_udp.c
index abfec12bde61d759336cd6a5e1e792b49311fa0a..a25f569d1de94bccb336b9d80e92f2b10deb3a73 100644 (file)
 #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,
similarity index 100%
rename from gtk/follow_udp.h
rename to ui/gtk/follow_udp.h
similarity index 98%
rename from gtk/font_utils.c
rename to ui/gtk/font_utils.c
index e4d14b8e1519a71f3cddb2eb6b95e6b3e165a01f..693087ed4454459659fc04ccc75ae1c1de6aa981 100644 (file)
 
 #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;
similarity index 100%
rename from gtk/font_utils.h
rename to ui/gtk/font_utils.h
similarity index 98%
rename from gtk/funnel_stat.c
rename to ui/gtk/funnel_stat.c
index ed71cef50eec5c44778fe3a408025c47f7f19b76..afc1bb9871510fbdeaef6567f334f369c9e6d5e9 100644 (file)
 #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 {
similarity index 97%
rename from gtk/goto_dlg.c
rename to ui/gtk/goto_dlg.c
index e8546a5e70b5788d239c748b3ddd98eb409d3d49..a014c0289523842d7bc9ef13826918db4b53a7ff 100644 (file)
 #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 */
similarity index 100%
rename from gtk/goto_dlg.h
rename to ui/gtk/goto_dlg.h
similarity index 99%
rename from gtk/graph_analysis.c
rename to ui/gtk/graph_analysis.c
index d8dd6df888e4edd825e9359baaa1b616aef4bfc5..430927403eac31574874d407bb786607b731a374 100644 (file)
 #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 thtime 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();
similarity index 100%
rename from gtk/graph_analysis.h
rename to ui/gtk/graph_analysis.h
similarity index 99%
rename from gtk/gsm_a_stat.c
rename to ui/gtk/gsm_a_stat.c
index 8ffb5aa33ad01f3a5ef343341c9345c609a1f9ea..5f39e516d7694f8d743a97f2b231efd539844b84 100644 (file)
 #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
 {
similarity index 98%
rename from gtk/gsm_map_stat.c
rename to ui/gtk/gsm_map_stat.c
index 9e1e587a8d0655f686f615c1afe2d10b51007091..4da736065b93dcb2384babea83bf9f3996e25f5e 100644 (file)
 #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
 {
similarity index 100%
rename from gtk/gsm_map_stat.h
rename to ui/gtk/gsm_map_stat.h
similarity index 98%
rename from gtk/gsm_map_summary.c
rename to ui/gtk/gsm_map_summary.c
index 4da1a0b255abcdd491369057c125a75a7c4e3077..6651a4766142315d3c2c37622d2a953d35c7d4ba 100644 (file)
 #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
similarity index 100%
rename from gtk/gtkglobals.h
rename to ui/gtk/gtkglobals.h
similarity index 96%
rename from gtk/gtp_stat.c
rename to ui/gtk/gtp_stat.c
index 8227e74adbafe774913f4e3ad31fbb39a7044099..ba095c760dcbff929e27030a02107ca1d5e7d8ac 100644 (file)
 #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 {
similarity index 100%
rename from gtk/gui_stat_menu.h
rename to ui/gtk/gui_stat_menu.h
similarity index 99%
rename from gtk/gui_stat_util.c
rename to ui/gtk/gui_stat_util.c
index eabc6d28358b4793cf0ce78aeacdf1a359a86b37..8ae18b69eb4b8693c3d6f877e7ff275d28650285 100644 (file)
@@ -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*/
similarity index 100%
rename from gtk/gui_stat_util.h
rename to ui/gtk/gui_stat_util.h
similarity index 99%
rename from gtk/gui_utils.c
rename to ui/gtk/gui_utils.c
index 6fcdcbe588c7bd819ae0b562c36a08e8da20aa46..f21c95b42b1fc5d734acef7ba560427016d293bc 100644 (file)
 #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"
similarity index 100%
rename from gtk/gui_utils.h
rename to ui/gtk/gui_utils.h
similarity index 98%
rename from gtk/h225_counter.c
rename to ui/gtk/h225_counter.c
index aac3d9a93b1a66ccd27bcd5977f6cb05b850ba7f..bd988947defda72df435188a74f810974f9d3f9d 100644 (file)
 #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);
 
similarity index 97%
rename from gtk/h225_ras_srt.c
rename to ui/gtk/h225_ras_srt.c
index bd63d76285c01f82bafa1995ff58dbdf8bad6cba..2f2974ee6e47c80a33396fa56e0f051e9cfad983 100644 (file)
 #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);
 
similarity index 98%
rename from gtk/help_dlg.c
rename to ui/gtk/help_dlg.c
index b9eb30cf26a62ec1c5dce801f1588c2ab5087514..43f647412b6c9bdb9d32e5232dde86a2125a0f50 100644 (file)
 
 #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>
similarity index 100%
rename from gtk/help_dlg.h
rename to ui/gtk/help_dlg.h
similarity index 97%
rename from gtk/hostlist_eth.c
rename to ui/gtk/hostlist_eth.c
index 644985f1d85acbe52920ea311ff7a10fc7fafa2e..9bc195e449318069c6137f59eb7cc50e077bd230 100644 (file)
@@ -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
similarity index 97%
rename from gtk/hostlist_fc.c
rename to ui/gtk/hostlist_fc.c
index 0e2e153553c992a0804a316ad5b97915891778e4..f60bf9106378723369c8e79cb37dc977d141e8ee 100644 (file)
@@ -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
similarity index 97%
rename from gtk/hostlist_fddi.c
rename to ui/gtk/hostlist_fddi.c
index 6764523c3faea4eb02e1a40b29a01feaca9063f4..6a01134d7f192b884d11bf392a498f99106c85a8 100644 (file)
@@ -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)
similarity index 97%
rename from gtk/hostlist_ip.c
rename to ui/gtk/hostlist_ip.c
index 186a691e7caeccc622d0f616d1a580cb4e1427df..7d7ac874df52ecaacdde08b0971a81db9e930e60 100644 (file)
@@ -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)
similarity index 97%
rename from gtk/hostlist_ipv6.c
rename to ui/gtk/hostlist_ipv6.c
index 4d3e04ed4d55d6a8a20c65afb41c8f702a1b1d05..fe0991999ca2fec7f2b9327b39137efe4dc9d5ed 100644 (file)
@@ -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)
similarity index 97%
rename from gtk/hostlist_ipx.c
rename to ui/gtk/hostlist_ipx.c
index 79cac56300511bb8206aab304d6630526160b419..802c055ac2f5532fb2fbad788f576cfcf26ab95f 100644 (file)
@@ -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)
similarity index 97%
rename from gtk/hostlist_jxta.c
rename to ui/gtk/hostlist_jxta.c
index 41ba709a7c28642b4f75227274e2da4aced00796..95c0f517c84fa39afe7726d3135727ec03b765ec 100644 (file)
@@ -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)
similarity index 97%
rename from gtk/hostlist_ncp.c
rename to ui/gtk/hostlist_ncp.c
index f3c98f1c2ef28f5bae6753913e22d6d483f933b1..2a03d780d316a92a7e2b0247e9432fbb458cc280 100644 (file)
@@ -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_)
similarity index 97%
rename from gtk/hostlist_rsvp.c
rename to ui/gtk/hostlist_rsvp.c
index 03510eeee941c1f4e4e5d90746b479419d2ad2e7..ccbe88cb3720c1620089a924c5f16779381258d3 100644 (file)
@@ -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)
similarity index 97%
rename from gtk/hostlist_sctp.c
rename to ui/gtk/hostlist_sctp.c
index db275ee45cef6242d45834e796422090b5fea830..132e831a93cbe9cd35946844242d3fe6c14d7390 100644 (file)
@@ -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)
similarity index 99%
rename from gtk/hostlist_table.c
rename to ui/gtk/hostlist_table.c
index 7ad1ad4f1f2d68621b012efb6d9287b6630924d9..923262777e2627c959d20c145a18f79e695430b9 100644 (file)
 #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"
similarity index 100%
rename from gtk/hostlist_table.h
rename to ui/gtk/hostlist_table.h
similarity index 97%
rename from gtk/hostlist_tcpip.c
rename to ui/gtk/hostlist_tcpip.c
index b0f521a9c4d147bfa86a883a24f63e2451264fec..e7aec10e9aaadfa3a7da6daaddda9835ccba97cc 100644 (file)
@@ -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)
similarity index 97%
rename from gtk/hostlist_tr.c
rename to ui/gtk/hostlist_tr.c
index aa22d6284313f16f748d1babf40e0e4104978ea2..a9ce34a13db9f375bb8a4e7885a24cfdee3ae75d 100644 (file)
@@ -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)
similarity index 97%
rename from gtk/hostlist_udpip.c
rename to ui/gtk/hostlist_udpip.c
index 7dd735eaf38f5a9967bfafba2df913fed8debf5a..4d88452bf648cfdd19ca821a9cccfdc8e95fe9d5 100644 (file)
@@ -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)
similarity index 97%
rename from gtk/hostlist_usb.c
rename to ui/gtk/hostlist_usb.c
index 0bb4d9776fd8e4fbe9737c05b0e8f0319073baa1..873cea941e9df539f58f8e9d066a3de18acf2364 100644 (file)
@@ -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_)
similarity index 97%
rename from gtk/hostlist_wlan.c
rename to ui/gtk/hostlist_wlan.c
index 56e51eb9223b3fcadc19e2ff46172db4cbe90d6d..d3b5f99a8151f1c8dde2a8661f5e8af38b170290 100644 (file)
@@ -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)
similarity index 99%
rename from gtk/iax2_analysis.c
rename to ui/gtk/iax2_analysis.c
index 69e811c9ecbcfed8b213b169d5cb63485b9a73e6..cbd48671ced1908b6354796e32c51330538d0bf6 100644 (file)
 #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
 {
similarity index 100%
rename from gtk/iax2_analysis.h
rename to ui/gtk/iax2_analysis.h
similarity index 99%
rename from gtk/io_stat.c
rename to ui/gtk/io_stat.c
index 971192c9d5fad365a18cfc68a44bd3cd1e612b17..a19e1f75d62ef02cdfa50e8adaddf100c3017d11 100644 (file)
 #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
 
similarity index 100%
rename from gtk/keys.h
rename to ui/gtk/keys.h
similarity index 96%
rename from gtk/ldap_stat.c
rename to ui/gtk/ldap_stat.c
index 7d628a3fbc52d9f325b3a40183bd05963e51513b..ce24391b22ecfe1e4ed520f945f42fb1377364e8 100644 (file)
 #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 {
similarity index 100%
rename from gtk/libui.vcproj
rename to ui/gtk/libui.vcproj
similarity index 99%
rename from gtk/mac_lte_stat_dlg.c
rename to ui/gtk/mac_lte_stat_dlg.c
index 0487d3be0c9c39bddbcd048c24dad17dea4922b9..0989132eac638b239458de5928e181aae47c88ac 100644 (file)
@@ -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>
 #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 */
similarity index 94%
rename from gtk/macros_dlg.c
rename to ui/gtk/macros_dlg.c
index d7d42c314d8fb1c72edc5c9cbfafb773b4cd1726..6b224c3ee08865ac5977c81d8bf04c78578afc27 100644 (file)
@@ -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);
similarity index 100%
rename from gtk/macros_dlg.h
rename to ui/gtk/macros_dlg.h
similarity index 99%
rename from gtk/main.c
rename to ui/gtk/main.c
index 9a7e970773df26efe65a60d38143898cde9f38b8..7d433bce5e33ffda929d326ab32d79247a2b39e5 100644 (file)
 #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"
similarity index 100%
rename from gtk/main.h
rename to ui/gtk/main.h
similarity index 99%
rename from gtk/main_airpcap_toolbar.c
rename to ui/gtk/main_airpcap_toolbar.c
index ee41a88a1dd45c539f9e38493065957c72432ff3..fb016d6b10812ceb6b242481003ce01c1febc1bb 100644 (file)
@@ -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>
similarity index 99%
rename from gtk/main_filter_toolbar.c
rename to ui/gtk/main_filter_toolbar.c
index 63d23324fc6f0b91ded1b914915ffed95e31feb4..43054bdf71a915dedd257275817b6b504cc31e37 100644 (file)
@@ -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"
similarity index 99%
rename from gtk/main_menubar.c
rename to ui/gtk/main_menubar.c
index 55224ea36b84a9d1b671925c15abcf6fce4da824..e10072f9665d6f952d5c2b64c536cefc418a7f62 100644 (file)
 #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
similarity index 99%
rename from gtk/main_proto_draw.c
rename to ui/gtk/main_proto_draw.c
index 3df1ee7c59afc3f727fa0fbb8ca085610182b992..d431b941acc8ecfc5c4fb6e6f9e610873ba09fc5 100644 (file)
 #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>
similarity index 98%
rename from gtk/main_statusbar.c
rename to ui/gtk/main_statusbar.c
index 3f4d82a6e515824dc4869dc67af899bc845180f3..a52abfd69dd5963c9021e09d64574e14529b727e 100644 (file)
 #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"
 
similarity index 96%
rename from gtk/main_toolbar.c
rename to ui/gtk/main_toolbar.c
index 9e9833190954d7f4d2978d03ef16f017a79ee382..1a0616a72d4e9e8a56de082948653d9bae40f998 100644 (file)
 #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;
 
similarity index 100%
rename from gtk/main_toolbar.h
rename to ui/gtk/main_toolbar.h
similarity index 99%
rename from gtk/main_welcome.c
rename to ui/gtk/main_welcome.c
index 9625c55105b0d1077ffddeeca1fe97985afa508b..31f120275177ab946a0b015f8469a8e64c8722c2 100644 (file)
 #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 */
similarity index 98%
rename from gtk/main_welcome.h
rename to ui/gtk/main_welcome.h
index 566f7669e272272b56b9536aa4bf295c52425156..23996e37239ac3d2562dea3689038eafaf81e365 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef __MAIN_WELCOME_H__
 #define __MAIN_WELCOME_H__
 
-#include "gtk/capture_dlg.h"
+#include "ui/gtk/capture_dlg.h"
 
 enum
 {
similarity index 96%
rename from gtk/manual_addr_resolv.c
rename to ui/gtk/manual_addr_resolv.c
index ca9ce892afe24ad76775db55ed1e5e4a0a46fb4b..9ac030fe3bac526f1c288adfea661be897ae500c 100644 (file)
 #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;
 
similarity index 99%
rename from gtk/mcast_stream.c
rename to ui/gtk/mcast_stream.c
index efb7bea44ade9a87aa38504a3d54d42256652e71..8a562e79599b71047643a82a410ca80422428aec 100644 (file)
@@ -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>
similarity index 100%
rename from gtk/mcast_stream.h
rename to ui/gtk/mcast_stream.h
similarity index 99%
rename from gtk/mcast_stream_dlg.c
rename to ui/gtk/mcast_stream_dlg.c
index b01b33b4ff60beae012e510131a9f666a75c8f46..b746cdf1eecfb7562c8450bb81c9a8a4ea647b31 100644 (file)
@@ -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>
 #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"
similarity index 97%
rename from gtk/megaco_stat.c
rename to ui/gtk/megaco_stat.c
index 38b7120e5dfd6e369e0051c443a565b5cf9250fb..b05159b7d1ed551096df00913ea174f78e9d1806 100644 (file)
 #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)
similarity index 100%
rename from gtk/menus.h
rename to ui/gtk/menus.h
similarity index 97%
rename from gtk/mgcp_stat.c
rename to ui/gtk/mgcp_stat.c
index 9643c47b6c2707e6c1d2013e1b6f82d59892981e..aa1834af06537960e4bfa2832b7a6acf05c7a795 100644 (file)
 #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
 
similarity index 98%
rename from gtk/mtp3_stat.c
rename to ui/gtk/mtp3_stat.c
index 438d365d365dcd2d6f069020528122f6b997002e..ddd1a8aa2ec00f3b4df541133accaa0b79746793 100644 (file)
 #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
 {
similarity index 100%
rename from gtk/mtp3_stat.h
rename to ui/gtk/mtp3_stat.h
similarity index 99%
rename from gtk/mtp3_summary.c
rename to ui/gtk/mtp3_summary.c
index 0bf9c95fb35913b258d70057ee8ef7cb45d5a42c..6afa7832968fa34ba089093b04c9f977279850d0 100644 (file)
 #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
 
similarity index 99%
rename from gtk/ncp_stat.c
rename to ui/gtk/ncp_stat.c
index 3bddc62d3df6184e3048815426130556576b5048..c83d3d0d9c9390b75f0a6da6075b1c0297862277 100644 (file)
 #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 */
similarity index 100%
rename from gtk/network_icons.h
rename to ui/gtk/network_icons.h
similarity index 98%
rename from gtk/new_packet_list.c
rename to ui/gtk/new_packet_list.c
index 39204fa6eecc8381cc131d7a8b49e878d7706a76..d8df054b10a9fc7e507e09ff40210df748473f89 100644 (file)
@@ -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>
 #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
 
similarity index 100%
rename from gtk/old-gtk-compat.h
rename to ui/gtk/old-gtk-compat.h
similarity index 98%
rename from gtk/packet_history.c
rename to ui/gtk/packet_history.c
index 06e60b1c0f668ff747727f87b1ce7dac9984e0c3..5951da3b026e524cd2e496b25836ce1b76f8b56d 100644 (file)
@@ -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;
similarity index 100%
rename from gtk/packet_history.h
rename to ui/gtk/packet_history.h
similarity index 99%
rename from gtk/packet_win.c
rename to ui/gtk/packet_win.c
index 681cb3f576548ee023c87a6a4903d651dee5b0f1..44e504e3393cf171635efa792c3ee651e0a46008 100644 (file)
 #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
similarity index 100%
rename from gtk/packet_win.h
rename to ui/gtk/packet_win.h
similarity index 97%
rename from gtk/pixmap_save.c
rename to ui/gtk/pixmap_save.c
index 3491c6beb996da98f5e7157ad546fe08ddb26704..49d17df03350cfb25fe8086053a549187510d96e 100644 (file)
 
 #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;
similarity index 100%
rename from gtk/pixmap_save.h
rename to ui/gtk/pixmap_save.h
similarity index 97%
rename from gtk/plugins_dlg.c
rename to ui/gtk/plugins_dlg.c
index 015ab57fa5ca4287d6eebb5b3513fbe70d3dce3f..543cc5f5b93496c519741b3c03fb84950b7468b2 100644 (file)
@@ -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)
similarity index 100%
rename from gtk/plugins_dlg.h
rename to ui/gtk/plugins_dlg.h
similarity index 99%
rename from gtk/prefs_capture.c
rename to ui/gtk/prefs_capture.c
index c82d0414b044f1664a62433471d2315c4faf789c..a5a5bbd44db00badf741d21343de8f46f4c38b62 100644 (file)
 #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>
 
 
similarity index 100%
rename from gtk/prefs_capture.h
rename to ui/gtk/prefs_capture.h
similarity index 99%
rename from gtk/prefs_column.c
rename to ui/gtk/prefs_column.c
index 3814229bee0873a45c575979379ae9caa250001c..1e919564c5cf4cec179228fc4bac603fc1ef39c5 100644 (file)
 
 #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;
similarity index 100%
rename from gtk/prefs_column.h
rename to ui/gtk/prefs_column.h
similarity index 98%
rename from gtk/prefs_dlg.c
rename to ui/gtk/prefs_dlg.c
index 9c71d18cefe16527a6b8e1cf714f1b1ea7817de1..e519456b57139197c6ee848edf8b1cb01cc28879 100644 (file)
 #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
similarity index 100%
rename from gtk/prefs_dlg.h
rename to ui/gtk/prefs_dlg.h
similarity index 98%
rename from gtk/prefs_filter_expressions.c
rename to ui/gtk/prefs_filter_expressions.c
index c3d13fd4590b479897afab308fc8b20fdc6a2bd6..91af3664bd59787e9e65725a1fe21856040acce0 100644 (file)
 
 #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);
similarity index 98%
rename from gtk/prefs_gui.c
rename to ui/gtk/prefs_gui.c
index 9cf675bc54d644f3252ac39e6b82d7effeb61f4f..fd3ab2fc5d811556efb7aaf720b5e48dd91e90d2 100644 (file)
 
 #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);
similarity index 100%
rename from gtk/prefs_gui.h
rename to ui/gtk/prefs_gui.h
similarity index 99%
rename from gtk/prefs_layout.c
rename to ui/gtk/prefs_layout.c
index be2aca76a8ca0621b6d1de4b3b0920327959ba61..3de6d4b408e9db2e7455ac4587447d8b24560acb 100644 (file)
 
 #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"
similarity index 100%
rename from gtk/prefs_layout.h
rename to ui/gtk/prefs_layout.h
similarity index 98%
rename from gtk/prefs_nameres.c
rename to ui/gtk/prefs_nameres.c
index 003444897d1e65d18f9af97ded97a21d52e52e63..886961794866bd2f313bd037672cdbfff9ee569e 100644 (file)
 #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"
similarity index 100%
rename from gtk/prefs_nameres.h
rename to ui/gtk/prefs_nameres.h
similarity index 95%
rename from gtk/prefs_print.c
rename to ui/gtk/prefs_print.c
index 2fd8b7522cf2d86e27fe5fd3cf77ca335a689bca..b4e701897aef68b08abfc43d5aab98486761e011 100644 (file)
 #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);
similarity index 100%
rename from gtk/prefs_print.h
rename to ui/gtk/prefs_print.h
similarity index 97%
rename from gtk/prefs_protocols.c
rename to ui/gtk/prefs_protocols.c
index 590ba02e3ea300154df72c8ebdfce28c93191a70..eeb6fcd7703ced68446cafc2331046ac3cba746c 100644 (file)
@@ -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
similarity index 98%
rename from gtk/prefs_stream.c
rename to ui/gtk/prefs_stream.c
index 74f49f2922daca63905152af1cd47fd6da7148d1..7dcd4d346624a67f25f6581b3c54b73b8ff7b8f7 100644 (file)
 #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"
similarity index 100%
rename from gtk/prefs_stream.h
rename to ui/gtk/prefs_stream.h
similarity index 98%
rename from gtk/prefs_taps.c
rename to ui/gtk/prefs_taps.c
index 348af0bc7bec22d3c38ae57d6b685973532ba4e2..d3eba4718ecc3b7765d645c76cdfb544630c5ef6 100644 (file)
@@ -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"
 
similarity index 100%
rename from gtk/prefs_taps.h
rename to ui/gtk/prefs_taps.h
similarity index 99%
rename from gtk/print_dlg.c
rename to ui/gtk/print_dlg.c
index 6f95902dbc09beb4da9fae414036a402bd17d047..63f7c30a39b32827464976f94265b1eae303c6a4 100644 (file)
 #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>
similarity index 99%
rename from gtk/profile_dlg.c
rename to ui/gtk/profile_dlg.c
index 16d719f5d4488fc08f94fc437930ffc8c809ed39..362caa94f0a83ec8ca2672f63f7475240191cee2 100644 (file)
 #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,
similarity index 100%
rename from gtk/profile_dlg.h
rename to ui/gtk/profile_dlg.h
similarity index 99%
rename from gtk/progress_dlg.c
rename to ui/gtk/progress_dlg.c
index 1d6ee322bf7708208766b5541b2f411a63f9fe0c..1d007eaf24924fd6752109191e83401faccbf5dd 100644 (file)
@@ -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"
similarity index 99%
rename from gtk/proto_dlg.c
rename to ui/gtk/proto_dlg.c
index 4e8d9183d9d8abfcacff7640c6cec028e53786b1..4e67e4bdef8db71c2c9dae7f1b2630fd4dbc0d5a 100644 (file)
 #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);
similarity index 100%
rename from gtk/proto_dlg.h
rename to ui/gtk/proto_dlg.h
similarity index 99%
rename from gtk/proto_help.c
rename to ui/gtk/proto_help.c
index 127345dd39cc9780e0325b05529888ad84c2de1b..80921da67062644a093af629baa28558b9643770 100644 (file)
@@ -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
similarity index 100%
rename from gtk/proto_help.h
rename to ui/gtk/proto_help.h
similarity index 99%
rename from gtk/proto_hier_stats_dlg.c
rename to ui/gtk/proto_hier_stats_dlg.c
index 8d04a4e53ff5ccf0e437f5a799e875ac07a8e7a5..21e95790e793839caa46c361bec00f8616a4e26a 100644 (file)
 #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 {
similarity index 98%
rename from gtk/radius_stat.c
rename to ui/gtk/radius_stat.c
index 2e4207a47c136e309ae34006179a56a780f92d5f..0c07503b4bd2f7337e27e7d2b590ff83463013e5 100644 (file)
 #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
 
similarity index 99%
rename from gtk/range_utils.c
rename to ui/gtk/range_utils.c
index 417af503a75c2d60c249db9e7ac7799ff99d376b..f32e6061aca614f6718c5ab0975fce75dc8e7f2a 100644 (file)
@@ -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"
similarity index 100%
rename from gtk/range_utils.h
rename to ui/gtk/range_utils.h
similarity index 99%
rename from gtk/recent.c
rename to ui/gtk/recent.c
index fe9ce289fee89807b9c88dad95fd54c65683de37..0a891df25ddfe071706395dba7101a219b581278 100644 (file)
 #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"
similarity index 100%
rename from gtk/recent.h
rename to ui/gtk/recent.h
similarity index 100%
rename from gtk/remote_icons.h
rename to ui/gtk/remote_icons.h
similarity index 99%
rename from gtk/rlc_lte_stat_dlg.c
rename to ui/gtk/rlc_lte_stat_dlg.c
index a2cf8c836036412d58137b9989a3e18c4a7732dc..fb8b8058c6b36d055148ac2c604f2a6fe9e942cd 100644 (file)
@@ -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>
 #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 */
similarity index 98%
rename from gtk/rpc_progs.c
rename to ui/gtk/rpc_progs.c
index 6608a4118a7160303d5a6df741a2459c1c2bfd1a..b385860b12dad201acc9c6a19b22e56b5d4a2b6c 100644 (file)
 #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
 
similarity index 97%
rename from gtk/rpc_stat.c
rename to ui/gtk/rpc_stat.c
index 0a042302113da2db1b510415c2d345d2afba7a4c..b4b6ddfc9c4fdebc738841255bffcc3e5b266f35 100644 (file)
 #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 {
similarity index 99%
rename from gtk/rtp_analysis.c
rename to ui/gtk/rtp_analysis.c
index abd64a9fb0bb2b7103b634eca9f7b46a0e4b6479..1d647056abac5a858052d00fc453f4c2697c09a9 100644 (file)
 #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
 {
similarity index 100%
rename from gtk/rtp_analysis.h
rename to ui/gtk/rtp_analysis.h
similarity index 99%
rename from gtk/rtp_player.c
rename to ui/gtk/rtp_player.c
index 96505c3354ee5984a2f459252c8868e8acc280a7..e0f3f76da49d7a80969b17b4753b46dea97afff4 100644 (file)
 #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*/
similarity index 100%
rename from gtk/rtp_player.h
rename to ui/gtk/rtp_player.h
similarity index 98%
rename from gtk/rtp_stream.c
rename to ui/gtk/rtp_stream.c
index 85d28cdbd1ce08d6cdb33f6e02e08e30f294fb42..2d96a10d931569958f40f124e46661b59364003c 100644 (file)
@@ -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.
  */
similarity index 100%
rename from gtk/rtp_stream.h
rename to ui/gtk/rtp_stream.h
similarity index 99%
rename from gtk/rtp_stream_dlg.c
rename to ui/gtk/rtp_stream_dlg.c
index 75595a65a1f6985e63fd51569fdfa004d9c78024..977e616ae0221833a5ec20374c3115d2e18a3289 100644 (file)
 #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";
similarity index 100%
rename from gtk/rtp_stream_dlg.h
rename to ui/gtk/rtp_stream_dlg.h
similarity index 100%
rename from gtk/sat.h
rename to ui/gtk/sat.h
similarity index 96%
rename from gtk/scsi_stat.c
rename to ui/gtk/scsi_stat.c
index f7b88417018246f800cb1805ac719464cd6ecb8a..4e4fe8658a7725f3300818046e37446986d46225 100644 (file)
 #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 {
similarity index 99%
rename from gtk/sctp_assoc_analyse.c
rename to ui/gtk/sctp_assoc_analyse.c
index 86e7f07a9091db2b69ea4d9b3a7bfeae6cf38050..27e13522940d2585272f665ae1564156b5762590 100644 (file)
 #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;
 
similarity index 99%
rename from gtk/sctp_byte_graph_dlg.c
rename to ui/gtk/sctp_byte_graph_dlg.c
index 03cc7fc4906cf8fbba634966087696e902ee528b..6be366fbbb5626c95807d3406a22d69f6988992c 100644 (file)
 #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
similarity index 97%
rename from gtk/sctp_chunk_stat.c
rename to ui/gtk/sctp_chunk_stat.c
index 6fba1ee100cc342137b967f23cdb3dad821e622e..6c7d86c7c0fc5c9f1f5a51182c3d1b26fe16cd43 100644 (file)
 #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);
similarity index 99%
rename from gtk/sctp_chunk_stat_dlg.c
rename to ui/gtk/sctp_chunk_stat_dlg.c
index c0a7b41b8d93d2d84db66b6e9efc5d91259c4616..a44741de68b41221e958ee242d852bfae927bfab 100644 (file)
 
 #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;
similarity index 98%
rename from gtk/sctp_error_dlg.c
rename to ui/gtk/sctp_error_dlg.c
index db2a254dccde9a0dbf8956f7282bd5f1e220be32..cca516785afac1c31d82b3453870f3614ed1c3f5 100644 (file)
 #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;
similarity index 99%
rename from gtk/sctp_graph_dlg.c
rename to ui/gtk/sctp_graph_dlg.c
index 6309751f3a8c6a4d090cc927a1267e553389efd8..149fe9ce7122b950fc417fd44ca503ef229b938c 100644 (file)
 #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
similarity index 99%
rename from gtk/sctp_stat.c
rename to ui/gtk/sctp_stat.c
index f547febebcdc5519d049e0e1f8cf15afc5ade4f3..1f4cf849a111722ca25f20c141b25a39ea4370a9 100644 (file)
@@ -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
 
similarity index 100%
rename from gtk/sctp_stat.h
rename to ui/gtk/sctp_stat.h
similarity index 98%
rename from gtk/sctp_stat_dlg.c
rename to ui/gtk/sctp_stat_dlg.c
index 49ccf843a9b4adbf7440b3ca46b1f5ea378b5d03..c66cf6767a44101fd1f6d43149aed10d725efac7 100644 (file)
 #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;
similarity index 99%
rename from gtk/service_response_time_table.c
rename to ui/gtk/service_response_time_table.c
index 31c94d83f2abcd4acdda87b1a2fc44546900d8cd..61392e9d606c24c44145d16dd288c8578a20d7aa 100644 (file)
 
 #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
 
similarity index 98%
rename from gtk/simple_dialog.c
rename to ui/gtk/simple_dialog.c
index 1e43a95f862786aef1d2dff12c2012cebc435044..3504195dc12d0a17aa35657bcaf8b4334490e21c 100644 (file)
 
 #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);
 
similarity index 99%
rename from gtk/sip_stat.c
rename to ui/gtk/sip_stat.c
index 23d6333279c17507d5248161e567494042725b42..f8a68dd641b9aa2c84b9806c2751fcbcda543e4b 100644 (file)
 #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
 
similarity index 95%
rename from gtk/smb2_stat.c
rename to ui/gtk/smb2_stat.c
index 94b782c4e27d7bb3b1e5f0daffba383a42ca84b2..fa1eb626f7740455a073be1453dc1cfdc11c4652 100644 (file)
 #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 {
similarity index 96%
rename from gtk/smb_stat.c
rename to ui/gtk/smb_stat.c
index d907d8bf1fe749b041b352fa2b0ab9b5f8ecb633..8502448308c2688a3534ccfe0eb2c148dd9416e2 100644 (file)
 #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 {
similarity index 98%
rename from gtk/stats_tree_stat.c
rename to ui/gtk/stats_tree_stat.c
index 6ae858f4087faca362022959cc5acf12db71bc47..250db6b87ff99be484fcf535ee429d8cb89a1715 100644 (file)
 #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;
similarity index 99%
rename from gtk/stock_icons.c
rename to ui/gtk/stock_icons.c
index 7a825e3daf2418da18dd36db90e6c5534e03f896..52456dca184d4c53bdf52bcbcd5063505374f08d 100644 (file)
@@ -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"
similarity index 100%
rename from gtk/stock_icons.h
rename to ui/gtk/stock_icons.h
similarity index 98%
rename from gtk/summary_dlg.c
rename to ui/gtk/summary_dlg.c
index df74339ef41fec97ee7699b928270a03bdd4f9d0..12a312053e0267544d02817c4dbff38eaae6d409 100644 (file)
 #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
similarity index 100%
rename from gtk