diff options
125 files changed, 223 insertions, 189 deletions
diff --git a/Makefile.common b/Makefile.common index e200daee8e..c74388ccde 100644 --- a/Makefile.common +++ b/Makefile.common @@ -147,7 +147,6 @@ wireshark_SOURCES = \ $(WIRESHARK_COMMON_SRC) \ $(SHARK_COMMON_CAPTURE_SRC) \ airpcap_loader.c \ - alert_box.c \ capture.c \ capture_info.c \ capture_opts.c \ @@ -160,13 +159,14 @@ wireshark_SOURCES = \ proto_hier_stats.c \ summary.c \ tempfile.c \ - u3.c + u3.c \ + ui/alert_box.c # corresponding headers wireshark_INCLUDES = \ airpcap.h \ airpcap_loader.h \ - alert_box.h \ + ui/alert_box.h \ capture.h \ capture_info.h \ capture_opts.h \ @@ -175,16 +175,16 @@ wireshark_INCLUDES = \ g711.h \ globals.h \ log.h \ - main_statusbar.h \ + ui/main_statusbar.h \ merge.h \ - progress_dlg.h \ + ui/progress_dlg.h \ proto_hier_stats.h \ - simple_dialog.h \ + ui/simple_dialog.h \ stat_menu.h \ summary.h \ sync_pipe.h \ u3.h \ - ui_util.h + ui/ui_util.h # tshark specifics tshark_SOURCES = \ @@ -47,13 +47,15 @@ #include "capture_ui_utils.h" #include "util.h" #include "capture-pcap-util.h" -#include "simple_dialog.h" #include <epan/prefs.h> #ifdef _WIN32 #include "capture-wpcap.h" #endif -#include "ui_util.h" + +#include "ui/simple_dialog.h" +#include "ui/ui_util.h" + #include "wsutil/file_util.h" #include "log.h" diff --git a/capture_sync.c b/capture_sync.c index cea918a0be..02223ef28a 100644 --- a/capture_sync.c +++ b/capture_sync.c @@ -97,7 +97,9 @@ #ifdef _WIN32 #include "capture-wpcap.h" #endif -#include "ui_util.h" + +#include "ui/ui_util.h" + #include <wsutil/file_util.h> #include "log.h" diff --git a/color_filters.c b/color_filters.c index 2a8a0cbdd2..bd6abfbd68 100644 --- a/color_filters.c +++ b/color_filters.c @@ -43,10 +43,11 @@ #include "color_filters.h" #include "file.h" #include <epan/dfilter/dfilter.h> -#include "simple_dialog.h" -#include "ui_util.h" #include <epan/prefs.h> +#include "ui/simple_dialog.h" +#include "ui/ui_util.h" + #define RED_COMPONENT(x) (guint16) (((((x) >> 16) & 0xff) * 65535 / 255)) #define GREEN_COMPONENT(x) (guint16) (((((x) >> 8) & 0xff) * 65535 / 255)) #define BLUE_COMPONENT(x) (guint16) ( (((x) & 0xff) * 65535 / 255)) @@ -58,11 +58,7 @@ #include "fileset.h" #include "tempfile.h" #include "merge.h" -#include "alert_box.h" -#include "simple_dialog.h" -#include "main_statusbar.h" -#include "progress_dlg.h" -#include "ui_util.h" + #include <epan/prefs.h> #include <epan/dfilter/dfilter.h> #include <epan/epan_dissect.h> @@ -75,6 +71,12 @@ #include <epan/strutil.h> #include <epan/addr_resolv.h> +#include "ui/alert_box.h" +#include "ui/simple_dialog.h" +#include "ui/main_statusbar.h" +#include "ui/progress_dlg.h" +#include "ui/ui_util.h" + #ifdef HAVE_LIBPCAP gboolean auto_scroll_live; #endif diff --git a/proto_hier_stats.c b/proto_hier_stats.c index 420e725e70..1265c816fc 100644 --- a/proto_hier_stats.c +++ b/proto_hier_stats.c @@ -30,7 +30,7 @@ #include "globals.h" #include "proto_hier_stats.h" -#include "progress_dlg.h" +#include "ui/progress_dlg.h" #include <epan/epan_dissect.h> #include <wtap.h> diff --git a/alert_box.c b/ui/alert_box.c index 666759df0f..666759df0f 100644 --- a/alert_box.c +++ b/ui/alert_box.c diff --git a/alert_box.h b/ui/alert_box.h index 53531e8455..53531e8455 100644 --- a/alert_box.h +++ b/ui/alert_box.h diff --git a/ui/gtk/afp_stat.c b/ui/gtk/afp_stat.c index f0da6e1d6e..4548b07aa6 100644 --- a/ui/gtk/afp_stat.c +++ b/ui/gtk/afp_stat.c @@ -42,10 +42,11 @@ #include <epan/dissectors/packet-afp.h> #include "../timestats.h" -#include "../simple_dialog.h" #include "../file.h" #include "../stat_menu.h" +#include "ui/simple_dialog.h" + #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/service_response_time_table.h" diff --git a/ui/gtk/airpcap_dlg.c b/ui/gtk/airpcap_dlg.c index 0ab3d717fb..892374f610 100644 --- a/ui/gtk/airpcap_dlg.c +++ b/ui/gtk/airpcap_dlg.c @@ -44,7 +44,7 @@ #include <pcap.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/main.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/airpcap_gui_utils.c b/ui/gtk/airpcap_gui_utils.c index 9e2902fb8d..a31322f14a 100644 --- a/ui/gtk/airpcap_gui_utils.c +++ b/ui/gtk/airpcap_gui_utils.c @@ -41,7 +41,7 @@ #include <epan/frequency-utils.h> #include <epan/crypt/airpdcap_ws.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/main.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/ansi_a_stat.c b/ui/gtk/ansi_a_stat.c index 8b1eccd9e8..926b4b7499 100644 --- a/ui/gtk/ansi_a_stat.c +++ b/ui/gtk/ansi_a_stat.c @@ -46,7 +46,8 @@ #include <epan/dissectors/packet-ansi_a.h> #include "../stat_menu.h" -#include "../simple_dialog.h" + +#include "ui/simple_dialog.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/ansi_map_stat.c b/ui/gtk/ansi_map_stat.c index 893707bcbc..3af4ca7d05 100644 --- a/ui/gtk/ansi_map_stat.c +++ b/ui/gtk/ansi_map_stat.c @@ -45,7 +45,8 @@ #include <epan/dissectors/packet-ansi_map.h> #include "../stat_menu.h" -#include "../simple_dialog.h" + +#include "ui/simple_dialog.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/bootp_stat.c b/ui/gtk/bootp_stat.c index 5b4e9f7c6a..c0e440503e 100644 --- a/ui/gtk/bootp_stat.c +++ b/ui/gtk/bootp_stat.c @@ -34,9 +34,10 @@ #include <epan/epan.h> #include <epan/tap.h> -#include "../simple_dialog.h" #include "../stat_menu.h" +#include "ui/simple_dialog.h" + #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/tap_param_dlg.h" diff --git a/ui/gtk/camel_counter.c b/ui/gtk/camel_counter.c index 66c3dd4d95..c8081859b7 100644 --- a/ui/gtk/camel_counter.c +++ b/ui/gtk/camel_counter.c @@ -44,7 +44,8 @@ #include "../stat_menu.h" #include "../timestats.h" -#include "../simple_dialog.h" + +#include "ui/simple_dialog.h" #include "ui/gtk/main.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/camel_srt.c b/ui/gtk/camel_srt.c index 6b0546e728..5d946e1374 100644 --- a/ui/gtk/camel_srt.c +++ b/ui/gtk/camel_srt.c @@ -43,10 +43,11 @@ #include <epan/camel-persistentdata.h> #include "../timestats.h" -#include "../simple_dialog.h" #include "../file.h" #include "../stat_menu.h" +#include "ui/simple_dialog.h" + #include "ui/gtk/main.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c index 9e3b1dd174..f34abf48dd 100644 --- a/ui/gtk/capture_dlg.c +++ b/ui/gtk/capture_dlg.c @@ -45,11 +45,12 @@ #include "../capture.h" #include "../capture_ifinfo.h" -#include "../simple_dialog.h" #include "../capture-pcap-util.h" #include "../capture_ui_utils.h" #include "../ringbuffer.h" +#include "ui/simple_dialog.h" + #include "ui/gtk/main.h" #include "ui/gtk/menus.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c index 4a2a6c1ed7..6b28683979 100644 --- a/ui/gtk/capture_file_dlg.c +++ b/ui/gtk/capture_file_dlg.c @@ -40,15 +40,16 @@ #include <epan/prefs.h> #include "../globals.h" -#include "../alert_box.h" -#include "../simple_dialog.h" #include "../color.h" -#include "../ui_util.h" #include "../color_filters.h" #include "../merge.h" #include "../util.h" #include <wsutil/file_util.h> +#include "ui/alert_box.h" +#include "ui/simple_dialog.h" +#include "ui/ui_util.h" + #include "ui/gtk/gtkglobals.h" #include "ui/gtk/keys.h" #include "ui/gtk/filter_dlg.h" diff --git a/ui/gtk/capture_if_details_dlg_win32.c b/ui/gtk/capture_if_details_dlg_win32.c index c941d121a2..a8b3562f26 100644 --- a/ui/gtk/capture_if_details_dlg_win32.c +++ b/ui/gtk/capture_if_details_dlg_win32.c @@ -39,7 +39,8 @@ #include "../file.h" #include "../capture.h" -#include "../simple_dialog.h" + +#include "ui/simple_dialog.h" #include "ui/gtk/main.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c index 40a3d34d1b..a6990954de 100644 --- a/ui/gtk/capture_if_dlg.c +++ b/ui/gtk/capture_if_dlg.c @@ -40,13 +40,14 @@ #include <epan/prefs.h> #include "../capture_ifinfo.h" -#include "../simple_dialog.h" #include "../capture.h" #include "../capture-pcap-util.h" #include "../capture_ui_utils.h" #include "wsutil/file_util.h" #include <wiretap/wtap.h> +#include "ui/simple_dialog.h" + #ifdef _WIN32 #include "ui/gtk/capture_if_details_dlg_win32.h" #endif diff --git a/ui/gtk/color_dlg.c b/ui/gtk/color_dlg.c index 0f3ee92558..67cb3dc46d 100644 --- a/ui/gtk/color_dlg.c +++ b/ui/gtk/color_dlg.c @@ -37,7 +37,8 @@ #include "../color.h" #include "../color_filters.h" #include "../file.h" -#include "../simple_dialog.h" + +#include "ui/simple_dialog.h" #include "ui/gtk/main.h" #include "ui/gtk/color_utils.h" diff --git a/ui/gtk/color_edit_dlg.c b/ui/gtk/color_edit_dlg.c index 77cb2fa23e..c1fca7f77a 100644 --- a/ui/gtk/color_edit_dlg.c +++ b/ui/gtk/color_edit_dlg.c @@ -34,7 +34,8 @@ #include "../color.h" #include "../color_filters.h" -#include "../simple_dialog.h" + +#include "ui/simple_dialog.h" #include "ui/gtk/color_dlg.h" #include "ui/gtk/color_utils.h" diff --git a/ui/gtk/color_utils.c b/ui/gtk/color_utils.c index 7e2d9243ed..9013e9a0d4 100644 --- a/ui/gtk/color_utils.c +++ b/ui/gtk/color_utils.c @@ -31,7 +31,8 @@ #include <gtk/gtk.h> #include "../color.h" -#include "../simple_dialog.h" + +#include "ui/simple_dialog.h" #include "ui/gtk/color_utils.h" #include "ui/gtk/gtkglobals.h" diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index ea487c4964..904a14f97e 100644 --- a/ui/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -57,9 +57,10 @@ #include <epan/in_cksum.h> #include "../stat_menu.h" -#include "../simple_dialog.h" #include "../timestats.h" +#include "ui/simple_dialog.h" + #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/stock_icons.h" #include "ui/gtk/help_dlg.h" diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c index 5573b8162a..46fbf340d4 100644 --- a/ui/gtk/conversations_table.c +++ b/ui/gtk/conversations_table.c @@ -39,9 +39,10 @@ #include <epan/tap.h> #include <epan/nstime.h> -#include "../simple_dialog.h" #include "../globals.h" +#include "ui/simple_dialog.h" + #include "ui/gtk/sat.h" #include "ui/gtk/conversations_table.h" #include "ui/gtk/filter_utils.h" diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c index e44b5bc20b..73b2643e7f 100644 --- a/ui/gtk/dcerpc_stat.c +++ b/ui/gtk/dcerpc_stat.c @@ -45,7 +45,8 @@ #include <epan/dissectors/packet-dcerpc.h> #include "../stat_menu.h" -#include "../simple_dialog.h" + +#include "ui/simple_dialog.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/decode_as_ber.c b/ui/gtk/decode_as_ber.c index 13d8131ccf..a50d3c45c0 100644 --- a/ui/gtk/decode_as_ber.c +++ b/ui/gtk/decode_as_ber.c @@ -32,7 +32,7 @@ #include <epan/epan_dissect.h> #include <epan/dissectors/packet-ber.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/decode_as_dlg.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/decode_as_dcerpc.c b/ui/gtk/decode_as_dcerpc.c index 202e73a8a7..5b08716181 100644 --- a/ui/gtk/decode_as_dcerpc.c +++ b/ui/gtk/decode_as_dcerpc.c @@ -32,7 +32,7 @@ #include <epan/epan_dissect.h> #include <epan/dissectors/packet-dcerpc.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/decode_as_dlg.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c index 8f954eeb3d..c50f7ee3d8 100644 --- a/ui/gtk/decode_as_dlg.c +++ b/ui/gtk/decode_as_dlg.c @@ -41,7 +41,7 @@ #include <wsutil/file_util.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/main.h" #include "ui/gtk/decode_as_dlg.h" diff --git a/ui/gtk/dfilter_expr_dlg.c b/ui/gtk/dfilter_expr_dlg.c index da690b5a01..d57ef5aaaf 100644 --- a/ui/gtk/dfilter_expr_dlg.c +++ b/ui/gtk/dfilter_expr_dlg.c @@ -47,7 +47,7 @@ #include <gtk/gtk.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/main.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/diameter_stat.c b/ui/gtk/diameter_stat.c index 3c6733f588..2d95745168 100644 --- a/ui/gtk/diameter_stat.c +++ b/ui/gtk/diameter_stat.c @@ -43,10 +43,11 @@ #include <epan/dissectors/packet-diameter.h> #include "../timestats.h" -#include "../simple_dialog.h" #include "../file.h" #include "../stat_menu.h" +#include "ui/simple_dialog.h" + #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/service_response_time_table.h" diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c index 43e2fb664c..6c8cf92172 100644 --- a/ui/gtk/drag_and_drop.c +++ b/ui/gtk/drag_and_drop.c @@ -38,11 +38,12 @@ #include "../util.h" #include "../file.h" -#include "../simple_dialog.h" #ifdef HAVE_LIBPCAP #include "../capture.h" #endif +#include "ui/simple_dialog.h" + #include "ui/gtk/gtkglobals.h" #include "ui/gtk/capture_file_dlg.h" #include "ui/gtk/drag_and_drop.h" diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c index 85fb78bcc4..5f8c54082f 100644 --- a/ui/gtk/expert_comp_dlg.c +++ b/ui/gtk/expert_comp_dlg.c @@ -39,9 +39,10 @@ #include <epan/stat_cmd_args.h> #include <epan/prefs.h> -#include "../simple_dialog.h" #include "../stat_menu.h" +#include "ui/simple_dialog.h" + #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/expert_comp_table.h" diff --git a/ui/gtk/expert_comp_table.c b/ui/gtk/expert_comp_table.c index 153ff83b6c..ec96b437e9 100644 --- a/ui/gtk/expert_comp_table.c +++ b/ui/gtk/expert_comp_table.c @@ -41,7 +41,7 @@ #include <epan/expert.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/expert_comp_table.h" #include "ui/gtk/filter_utils.h" diff --git a/ui/gtk/export_object.c b/ui/gtk/export_object.c index 7d34fbbcf5..f320ca091d 100644 --- a/ui/gtk/export_object.c +++ b/ui/gtk/export_object.c @@ -28,7 +28,7 @@ # include "config.h" #endif -#include <gtk/gtk.h> +#include <string.h> #ifdef HAVE_FCNTL_H #include <fcntl.h> @@ -38,14 +38,17 @@ #include <unistd.h> #endif +#include <gtk/gtk.h> + #include <epan/packet_info.h> #include <epan/prefs.h> #include <epan/tap.h> -#include <../alert_box.h> -#include <../simple_dialog.h> #include <wsutil/file_util.h> +#include <ui/alert_box.h> +#include <ui/simple_dialog.h> + #include "ui/gtk/dlg_utils.h" #include "ui/gtk/file_dlg.h" #include "ui/gtk/gui_utils.h" @@ -53,7 +56,6 @@ #include "ui/gtk/main.h" #include "ui/gtk/stock_icons.h" #include "ui/gtk/export_object.h" -#include <string.h> enum { EO_PKT_NUM_COLUMN, diff --git a/ui/gtk/export_sslkeys.c b/ui/gtk/export_sslkeys.c index f31b6f6d63..974013ed28 100644 --- a/ui/gtk/export_sslkeys.c +++ b/ui/gtk/export_sslkeys.c @@ -31,6 +31,7 @@ #endif #include <ctype.h> +#include <string.h> #ifdef HAVE_FCNTL_H #include <fcntl.h> @@ -40,15 +41,13 @@ #include <unistd.h> #endif +#include <wsutil/file_util.h> + #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #if GTK_CHECK_VERSION(3,0,0) # include <gdk/gdkkeysyms-compat.h> #endif -#include <wsutil/file_util.h> - -#include <string.h> - #include <epan/filesystem.h> #include <epan/packet.h> @@ -58,11 +57,12 @@ #include <epan/dissectors/packet-ssl.h> #include <epan/dissectors/packet-ssl-utils.h> -#include "../simple_dialog.h" #include "../isprint.h" -#include "../alert_box.h" -#include "../progress_dlg.h" -#include "../ui_util.h" + +#include "ui/simple_dialog.h" +#include "ui/alert_box.h" +#include "ui/progress_dlg.h" +#include "ui/ui_util.h" #include "ui/gtk/keys.h" #include "ui/gtk/color_utils.h" diff --git a/ui/gtk/fc_stat.c b/ui/gtk/fc_stat.c index 362b0e41cf..05453b57ae 100644 --- a/ui/gtk/fc_stat.c +++ b/ui/gtk/fc_stat.c @@ -43,7 +43,7 @@ #include <epan/dissectors/packet-fc.h> #include "../timestats.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c index b5a77358a6..5e1f7013f9 100644 --- a/ui/gtk/file_import_dlg.c +++ b/ui/gtk/file_import_dlg.c @@ -43,8 +43,9 @@ #include <gtk/gtk.h> #include "filters.h" -#include "simple_dialog.h" -#include "alert_box.h" + +#include "ui/simple_dialog.h" +#include "ui/alert_box.h" #include "ui/gtk/gtkglobals.h" #include "ui/gtk/stock_icons.h" diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c index 1684190587..50ca8b841b 100644 --- a/ui/gtk/fileset_dlg.c +++ b/ui/gtk/fileset_dlg.c @@ -36,7 +36,7 @@ #include <epan/filesystem.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../fileset.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c index 1349826b06..ddbb82812d 100644 --- a/ui/gtk/filter_dlg.c +++ b/ui/gtk/filter_dlg.c @@ -35,8 +35,8 @@ #include <epan/proto.h> #include "../filters.h" -#include "../simple_dialog.h" -#include "../main_statusbar.h" +#include "ui/simple_dialog.h" +#include "ui/main_statusbar.h" #include "ui/gtk/main.h" #include "ui/gtk/filter_dlg.h" diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c index aa9e693e63..0332bb705e 100644 --- a/ui/gtk/filter_expression_save_dlg.c +++ b/ui/gtk/filter_expression_save_dlg.c @@ -41,9 +41,11 @@ #include <epan/filter_expressions.h> #include "../globals.h" -#include "../alert_box.h" -#include "../simple_dialog.h" -#include "../main_statusbar.h" + +#include "ui/alert_box.h" +#include "ui/simple_dialog.h" +#include "ui/main_statusbar.h" +#include "ui/ui_util.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/filter_expression_save_dlg.h" @@ -54,7 +56,7 @@ #include "ui/gtk/filter_autocomplete.h" #include "ui/gtk/keys.h" #include "ui/gtk/help_dlg.h" -#include "ui_util.h" + #include "main.h" #include "main_filter_toolbar.h" diff --git a/ui/gtk/find_dlg.c b/ui/gtk/find_dlg.c index c690f16dab..7ff98efdd9 100644 --- a/ui/gtk/find_dlg.c +++ b/ui/gtk/find_dlg.c @@ -37,9 +37,9 @@ #include <epan/prefs.h> #include "../globals.h" -#include "../alert_box.h" -#include "../simple_dialog.h" -#include "../main_statusbar.h" +#include "ui/alert_box.h" +#include "ui/simple_dialog.h" +#include "ui/main_statusbar.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/find_dlg.h" diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c index 72ffcfa405..431a8f0aac 100644 --- a/ui/gtk/firewall_dlg.c +++ b/ui/gtk/firewall_dlg.c @@ -57,8 +57,8 @@ #include <epan/filesystem.h> #include <epan/dissectors/packet-ipv6.h> -#include <../alert_box.h> -#include <../simple_dialog.h> +#include <ui/alert_box.h> +#include <ui/simple_dialog.h> #include <wsutil/file_util.h> #include "ui/gtk/main.h" diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c index f8b62adeae..8f34b0c259 100644 --- a/ui/gtk/flow_graph.c +++ b/ui/gtk/flow_graph.c @@ -41,7 +41,7 @@ #include <epan/strutil.h> #include "../stat_menu.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/graph_analysis.h" #include "ui/gtk/gui_stat_menu.h" diff --git a/ui/gtk/follow_ssl.c b/ui/gtk/follow_ssl.c index cee99305db..dfc3a49084 100644 --- a/ui/gtk/follow_ssl.c +++ b/ui/gtk/follow_ssl.c @@ -46,8 +46,8 @@ #include <epan/filesystem.h> #include <epan/tap.h> -#include <../alert_box.h> -#include <../simple_dialog.h> +#include <ui/alert_box.h> +#include <ui/simple_dialog.h> #include <../util.h> #include "gtkglobals.h" diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c index 6e08ae280c..6f01ec3f25 100644 --- a/ui/gtk/follow_stream.c +++ b/ui/gtk/follow_stream.c @@ -41,10 +41,10 @@ #include <epan/prefs.h> #include <epan/charsets.h> -#include <../alert_box.h> +#include <ui/alert_box.h> #include <../isprint.h> #include <../print.h> -#include <../simple_dialog.h> +#include <ui/simple_dialog.h> #include <wsutil/file_util.h> #include "ui/gtk/color_utils.h" diff --git a/ui/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c index ada4f65b55..5738d1e65e 100644 --- a/ui/gtk/follow_tcp.c +++ b/ui/gtk/follow_tcp.c @@ -49,8 +49,8 @@ #include <epan/charsets.h> #include "../file.h" -#include "../alert_box.h" -#include "../simple_dialog.h" +#include "ui/alert_box.h" +#include "ui/simple_dialog.h" #include "../tempfile.h" #include <wsutil/file_util.h> diff --git a/ui/gtk/follow_udp.c b/ui/gtk/follow_udp.c index a25f569d1d..6b26321f46 100644 --- a/ui/gtk/follow_udp.c +++ b/ui/gtk/follow_udp.c @@ -37,7 +37,7 @@ #include <epan/strutil.h> #include <epan/tap.h> -#include <../simple_dialog.h> +#include <ui/simple_dialog.h> #include "gtkglobals.h" #include "ui/gtk/follow_stream.h" diff --git a/ui/gtk/font_utils.c b/ui/gtk/font_utils.c index 693087ed44..4af1a8877b 100644 --- a/ui/gtk/font_utils.c +++ b/ui/gtk/font_utils.c @@ -40,7 +40,7 @@ #include <wsutil/unicode-utils.h> #endif -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/main.h" #include "ui/gtk/recent.h" diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c index afc1bb9871..7d089f575e 100644 --- a/ui/gtk/funnel_stat.c +++ b/ui/gtk/funnel_stat.c @@ -53,10 +53,10 @@ #include <epan/funnel.h> #include "../timestats.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" -#include "../progress_dlg.h" +#include "ui/progress_dlg.h" #include "../color_filters.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/goto_dlg.c b/ui/gtk/goto_dlg.c index a014c02895..567f535f7c 100644 --- a/ui/gtk/goto_dlg.c +++ b/ui/gtk/goto_dlg.c @@ -32,8 +32,8 @@ #include <epan/proto.h> #include "../globals.h" -#include "../simple_dialog.h" -#include "../ui_util.h" +#include "ui/simple_dialog.h" +#include "ui/ui_util.h" #include "ui/gtk/goto_dlg.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c index 158430d22f..9d749f16bf 100644 --- a/ui/gtk/graph_analysis.c +++ b/ui/gtk/graph_analysis.c @@ -52,8 +52,8 @@ #include <epan/filesystem.h> #include "../util.h" -#include "../simple_dialog.h" -#include "../alert_box.h" +#include "ui/simple_dialog.h" +#include "ui/alert_box.h" #include <wsutil/file_util.h> #include "ui/gtk/gtkglobals.h" diff --git a/ui/gtk/gsm_a_stat.c b/ui/gtk/gsm_a_stat.c index 5f39e516d7..e9e503711b 100644 --- a/ui/gtk/gsm_a_stat.c +++ b/ui/gtk/gsm_a_stat.c @@ -46,7 +46,7 @@ #include <epan/dissectors/packet-gsm_a_common.h> #include "../stat_menu.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/gsm_map_stat.c b/ui/gtk/gsm_map_stat.c index 4da736065b..5f272fab14 100644 --- a/ui/gtk/gsm_map_stat.c +++ b/ui/gtk/gsm_map_stat.c @@ -47,7 +47,7 @@ #include <epan/dissectors/packet-gsm_map.h> #include "../stat_menu.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/gtp_stat.c b/ui/gtk/gtp_stat.c index ba095c760d..7eb6b1d37c 100644 --- a/ui/gtk/gtp_stat.c +++ b/ui/gtk/gtp_stat.c @@ -42,7 +42,7 @@ #include <epan/dissectors/packet-gtp.h> #include "../timestats.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/gui_stat_util.c b/ui/gtk/gui_stat_util.c index 8ae18b69eb..db94cbf79d 100644 --- a/ui/gtk/gui_stat_util.c +++ b/ui/gtk/gui_stat_util.c @@ -36,7 +36,7 @@ #include <gtk/gtk.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../file.h" #include "ui/gtk/gui_stat_util.h" diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c index f21c95b42b..5a35348fa9 100644 --- a/ui/gtk/gui_utils.c +++ b/ui/gtk/gui_utils.c @@ -41,7 +41,7 @@ #include "epan/epan.h" #include <epan/packet_info.h> -#include "../ui_util.h" +#include "ui/ui_util.h" #include <wsutil/file_util.h> #include "ui/gtk/gtkglobals.h" diff --git a/ui/gtk/h225_counter.c b/ui/gtk/h225_counter.c index bd988947de..019db0fe6a 100644 --- a/ui/gtk/h225_counter.c +++ b/ui/gtk/h225_counter.c @@ -42,7 +42,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-h225.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/h225_ras_srt.c b/ui/gtk/h225_ras_srt.c index 2f2974ee6e..202b3101dc 100644 --- a/ui/gtk/h225_ras_srt.c +++ b/ui/gtk/h225_ras_srt.c @@ -43,7 +43,7 @@ #include <epan/dissectors/packet-h225.h> #include "../timestats.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/help_dlg.c b/ui/gtk/help_dlg.c index 43f647412b..9a8fc011a6 100644 --- a/ui/gtk/help_dlg.c +++ b/ui/gtk/help_dlg.c @@ -35,7 +35,7 @@ #include "epan/filesystem.h" #include <epan/prefs.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/help_dlg.h" #include "ui/gtk/text_page_utils.h" diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c index 923262777e..ae691e9438 100644 --- a/ui/gtk/hostlist_table.c +++ b/ui/gtk/hostlist_table.c @@ -49,8 +49,8 @@ #include <wsutil/file_util.h> -#include "../simple_dialog.h" -#include "../alert_box.h" +#include "ui/simple_dialog.h" +#include "ui/alert_box.h" #include "../tempfile.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index cbd48671ce..814f4673f8 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -66,10 +66,10 @@ #include "../util.h" #include "../g711.h" -#include "../alert_box.h" -#include "../simple_dialog.h" +#include "ui/alert_box.h" +#include "ui/simple_dialog.h" #include "../stat_menu.h" -#include "../progress_dlg.h" +#include "ui/progress_dlg.h" #include "../tempfile.h" #include <wsutil/file_util.h> diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c index a19e1f75d6..c42860af57 100644 --- a/ui/gtk/io_stat.c +++ b/ui/gtk/io_stat.c @@ -45,8 +45,8 @@ #include <epan/strutil.h> #include "../stat_menu.h" -#include "../alert_box.h" -#include "../simple_dialog.h" +#include "ui/alert_box.h" +#include "ui/simple_dialog.h" #include "ui/gtk/gtkglobals.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/ldap_stat.c b/ui/gtk/ldap_stat.c index ce24391b22..a31f70a647 100644 --- a/ui/gtk/ldap_stat.c +++ b/ui/gtk/ldap_stat.c @@ -41,7 +41,7 @@ #include <epan/dissectors/packet-ldap.h> #include "../timestats.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c index 0989132eac..5326f4a6c4 100644 --- a/ui/gtk/mac_lte_stat_dlg.c +++ b/ui/gtk/mac_lte_stat_dlg.c @@ -47,7 +47,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-mac-lte.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../stat_menu.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 0362df3e98..f79d94a4ed 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -92,18 +92,18 @@ #include "../color.h" #include "../color_filters.h" #include "../print.h" -#include "../simple_dialog.h" -#include "../main_statusbar.h" +#include "ui/simple_dialog.h" +#include "ui/main_statusbar.h" #include "../register.h" #include "../ringbuffer.h" -#include "../ui_util.h" +#include "ui/ui_util.h" #include "../util.h" #include "../clopts_common.h" #include "../console_io.h" #include "../cmdarg_err.h" #include "../version_info.h" #include "../merge.h" -#include "../alert_box.h" +#include "ui/alert_box.h" #include "../log.h" #include "../u3.h" #include <wsutil/file_util.h> diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index e10072f966..8a702ad0fb 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -47,9 +47,9 @@ #include <epan/filesystem.h> #include "../print.h" -#include "../ui_util.h" -#include "../simple_dialog.h" -#include "../main_statusbar.h" +#include "ui/ui_util.h" +#include "ui/simple_dialog.h" +#include "ui/main_statusbar.h" #include "../color_filters.h" #include "../stat_menu.h" #include "../u3.h" diff --git a/ui/gtk/main_proto_draw.c b/ui/gtk/main_proto_draw.c index d431b941ac..daa50f4952 100644 --- a/ui/gtk/main_proto_draw.c +++ b/ui/gtk/main_proto_draw.c @@ -55,10 +55,10 @@ #include <epan/filesystem.h> #include "../isprint.h" -#include "../alert_box.h" -#include "../simple_dialog.h" -#include "../progress_dlg.h" -#include "../ui_util.h" +#include "ui/alert_box.h" +#include "ui/simple_dialog.h" +#include "ui/progress_dlg.h" +#include "ui/ui_util.h" #include <wsutil/file_util.h> #include "ui/gtk/keys.h" diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c index a52abfd69d..4937c3a69e 100644 --- a/ui/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -46,6 +46,8 @@ #include "../capture.h" #endif +#include "ui/main_statusbar.h" + #include "ui/gtk/recent.h" #include "ui/gtk/main.h" #include "ui/gtk/main_statusbar_private.h" @@ -58,8 +60,6 @@ #include "ui/gtk/keys.h" #include "ui/gtk/menus.h" -#include "main_statusbar.h" - /* * The order below defines the priority of info bar contexts. */ diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c index b80c663d7d..3b7f0aff99 100644 --- a/ui/gtk/main_welcome.c +++ b/ui/gtk/main_welcome.c @@ -41,9 +41,11 @@ #include "capture_opts.h" #include "capture_ui_utils.h" #endif -#include "simple_dialog.h" + #include <wsutil/file_util.h> +#include "ui/simple_dialog.h" + #include "ui/gtk/gui_utils.h" #include "ui/gtk/color_utils.h" #include "ui/gtk/recent.h" diff --git a/ui/gtk/manual_addr_resolv.c b/ui/gtk/manual_addr_resolv.c index 9ac030fe3b..6003ad0c92 100644 --- a/ui/gtk/manual_addr_resolv.c +++ b/ui/gtk/manual_addr_resolv.c @@ -35,7 +35,7 @@ #include <gtk/gtk.h> #include "epan/addr_resolv.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/mcast_stream.c b/ui/gtk/mcast_stream.c index 8a562e7959..61b67b19bc 100644 --- a/ui/gtk/mcast_stream.c +++ b/ui/gtk/mcast_stream.c @@ -54,8 +54,8 @@ #include <epan/tap.h> #include <epan/strutil.h> -#include "../alert_box.h" -#include "../simple_dialog.h" +#include "ui/alert_box.h" +#include "ui/simple_dialog.h" #include "ui/gtk/mcast_stream.h" #include "ui/gtk/mcast_stream_dlg.h" diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c index b746cdf1ee..d242e81c8f 100644 --- a/ui/gtk/mcast_stream_dlg.c +++ b/ui/gtk/mcast_stream_dlg.c @@ -45,7 +45,7 @@ #include "../globals.h" #include "../stat_menu.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/mcast_stream_dlg.h" #include "ui/gtk/mcast_stream.h" diff --git a/ui/gtk/megaco_stat.c b/ui/gtk/megaco_stat.c index b05159b7d1..9f55c4c381 100644 --- a/ui/gtk/megaco_stat.c +++ b/ui/gtk/megaco_stat.c @@ -45,7 +45,7 @@ #include <epan/prefs-int.h> #include "../timestats.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/mgcp_stat.c b/ui/gtk/mgcp_stat.c index aa1834af06..e8b370618d 100644 --- a/ui/gtk/mgcp_stat.c +++ b/ui/gtk/mgcp_stat.c @@ -42,7 +42,7 @@ #include "epan/dissectors/packet-mgcp.h" #include "../timestats.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/mtp3_stat.c b/ui/gtk/mtp3_stat.c index ddd1a8aa2e..9b0d4d298d 100644 --- a/ui/gtk/mtp3_stat.c +++ b/ui/gtk/mtp3_stat.c @@ -46,7 +46,7 @@ #include <epan/dissectors/packet-mtp3.h> #include "../stat_menu.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/ncp_stat.c b/ui/gtk/ncp_stat.c index c83d3d0d9c..e20a579d87 100644 --- a/ui/gtk/ncp_stat.c +++ b/ui/gtk/ncp_stat.c @@ -41,7 +41,7 @@ #include <epan/dissectors/packet-ncp-int.h> #include "../timestats.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/new_packet_list.c b/ui/gtk/new_packet_list.c index d8df054b10..3cea65cb54 100644 --- a/ui/gtk/new_packet_list.c +++ b/ui/gtk/new_packet_list.c @@ -42,10 +42,10 @@ #include "epan/prefs.h" #include <epan/packet.h> #include <epan/epan_dissect.h> -#include "../ui_util.h" -#include "../progress_dlg.h" -#include "../simple_dialog.h" -#include "../main_statusbar.h" +#include "ui/ui_util.h" +#include "ui/progress_dlg.h" +#include "ui/simple_dialog.h" +#include "ui/main_statusbar.h" #include "epan/emem.h" #include "globals.h" #include "ui/gtk/gtkglobals.h" diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c index 989a3ff7e1..9f3e5f6cd0 100644 --- a/ui/gtk/packet_list_store.c +++ b/ui/gtk/packet_list_store.c @@ -38,7 +38,9 @@ #include <glib.h> #include "packet_list_store.h" -#include "ui_util.h" + +#include "ui/progress_dlg.h" +#include "ui/ui_util.h" #include <epan/epan_dissect.h> #include <epan/column_info.h> @@ -50,8 +52,6 @@ #include "globals.h" -#include "../progress_dlg.h" - static void packet_list_init(PacketList *pkg_tree); static void packet_list_class_init(PacketListClass *klass); static void packet_list_tree_model_init(GtkTreeModelIface *iface); diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c index 44e504e339..f07f9e0d23 100644 --- a/ui/gtk/packet_win.c +++ b/ui/gtk/packet_win.c @@ -60,9 +60,9 @@ #include "../file.h" #include "../print.h" -#include "../ui_util.h" +#include "ui/ui_util.h" #include "../summary.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/font_utils.h" #include "ui/gtk/main.h" diff --git a/ui/gtk/pixmap_save.c b/ui/gtk/pixmap_save.c index 49d17df033..b4c0aca5b7 100644 --- a/ui/gtk/pixmap_save.c +++ b/ui/gtk/pixmap_save.c @@ -33,7 +33,7 @@ #include <epan/filesystem.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/pixmap_save.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c index a5a5bbd44d..07e8dbfa44 100644 --- a/ui/gtk/prefs_capture.c +++ b/ui/gtk/prefs_capture.c @@ -33,7 +33,7 @@ #include <epan/prefs.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../capture_ifinfo.h" #include "../capture_ui_utils.h" diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c index e519456b57..41205f3e93 100644 --- a/ui/gtk/prefs_dlg.c +++ b/ui/gtk/prefs_dlg.c @@ -38,7 +38,7 @@ #include "../file.h" #include "../print.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/main.h" #include "ui/gtk/prefs_column.h" diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c index fd3ab2fc5d..c35dd1d09b 100644 --- a/ui/gtk/prefs_gui.c +++ b/ui/gtk/prefs_gui.c @@ -31,7 +31,7 @@ #include <epan/prefs.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/prefs_gui.h" #include "ui/gtk/gtkglobals.h" diff --git a/ui/gtk/prefs_layout.c b/ui/gtk/prefs_layout.c index c8427740e7..7ed2320086 100644 --- a/ui/gtk/prefs_layout.c +++ b/ui/gtk/prefs_layout.c @@ -30,7 +30,7 @@ #include <epan/prefs.h> -#include "../ui_util.h" +#include "ui/ui_util.h" #include "ui/gtk/prefs_layout.h" #include "ui/gtk/gtkglobals.h" diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c index 63f7c30a39..fe58106716 100644 --- a/ui/gtk/print_dlg.c +++ b/ui/gtk/print_dlg.c @@ -35,8 +35,8 @@ #include <epan/filesystem.h> #include "../print.h" -#include "../alert_box.h" -#include "../simple_dialog.h" +#include "ui/alert_box.h" +#include "ui/simple_dialog.h" #include "../util.h" #include <wsutil/file_util.h> diff --git a/ui/gtk/profile_dlg.c b/ui/gtk/profile_dlg.c index 362caa94f0..7575a43941 100644 --- a/ui/gtk/profile_dlg.c +++ b/ui/gtk/profile_dlg.c @@ -38,7 +38,7 @@ #include <epan/filesystem.h> #include <epan/prefs.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include <wsutil/file_util.h> #include "ui/gtk/main.h" diff --git a/ui/gtk/progress_dlg.c b/ui/gtk/progress_dlg.c index 1d007eaf24..ac07c0403e 100644 --- a/ui/gtk/progress_dlg.c +++ b/ui/gtk/progress_dlg.c @@ -30,7 +30,7 @@ #include <gtk/gtk.h> -#include "../progress_dlg.h" +#include "ui/progress_dlg.h" #include "ui/gtk/gtkglobals.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/proto_dlg.c b/ui/gtk/proto_dlg.c index 4e67e4bdef..ced69ad8d0 100644 --- a/ui/gtk/proto_dlg.c +++ b/ui/gtk/proto_dlg.c @@ -38,7 +38,7 @@ #include <epan/filesystem.h> #include "../util.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../disabled_protos.h" #include "ui/gtk/main.h" diff --git a/ui/gtk/proto_hier_stats_dlg.c b/ui/gtk/proto_hier_stats_dlg.c index 21e95790e7..34c8dfe71b 100644 --- a/ui/gtk/proto_hier_stats_dlg.c +++ b/ui/gtk/proto_hier_stats_dlg.c @@ -32,7 +32,7 @@ #include <gtk/gtk.h> #include "../proto_hier_stats.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/proto_hier_stats_dlg.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/radius_stat.c b/ui/gtk/radius_stat.c index 0c07503b4b..73f0aae8f3 100644 --- a/ui/gtk/radius_stat.c +++ b/ui/gtk/radius_stat.c @@ -42,7 +42,7 @@ #include <epan/dissectors/packet-radius.h> #include "../timestats.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/range_utils.c b/ui/gtk/range_utils.c index f32e6061ac..ded2a9e86a 100644 --- a/ui/gtk/range_utils.c +++ b/ui/gtk/range_utils.c @@ -31,7 +31,7 @@ #include <gtk/gtk.h> #include "../globals.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../packet-range.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/recent.c b/ui/gtk/recent.c index 0a891df25d..c1b62a72f6 100644 --- a/ui/gtk/recent.c +++ b/ui/gtk/recent.c @@ -41,7 +41,7 @@ #include <epan/prefs-int.h> #include <epan/column.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../u3.h" #include <wsutil/file_util.h> diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c index fb8b8058c6..0a822be525 100644 --- a/ui/gtk/rlc_lte_stat_dlg.c +++ b/ui/gtk/rlc_lte_stat_dlg.c @@ -46,7 +46,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-rlc-lte.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../stat_menu.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c index b4b6ddfc9c..9d5ae80248 100644 --- a/ui/gtk/rpc_stat.c +++ b/ui/gtk/rpc_stat.c @@ -43,7 +43,7 @@ #include <epan/dissectors/packet-rpc.h> #include "../stat_menu.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index 1d647056ab..f64c069ec2 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -64,10 +64,10 @@ #include "../util.h" #include "../g711.h" -#include "../alert_box.h" -#include "../simple_dialog.h" +#include "ui/alert_box.h" +#include "ui/simple_dialog.h" #include "../stat_menu.h" -#include "../progress_dlg.h" +#include "ui/progress_dlg.h" #include "../tempfile.h" #include <wsutil/file_util.h> diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c index e0f3f76da4..e7cdad7573 100644 --- a/ui/gtk/rtp_player.c +++ b/ui/gtk/rtp_player.c @@ -70,7 +70,7 @@ #include <epan/prefs.h> #include "../globals.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../codecs/G711a/G711adecode.h" #include "../codecs/G711u/G711udecode.h" diff --git a/ui/gtk/rtp_stream.c b/ui/gtk/rtp_stream.c index 2d96a10d93..5498e0d68d 100644 --- a/ui/gtk/rtp_stream.c +++ b/ui/gtk/rtp_stream.c @@ -48,8 +48,8 @@ #include <epan/addr_resolv.h> #include "../globals.h" -#include "../alert_box.h" -#include "../simple_dialog.h" +#include "ui/alert_box.h" +#include "ui/simple_dialog.h" #include "../tap-rtp-common.h" #include <wsutil/file_util.h> diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c index 977e616ae0..23217b89a3 100644 --- a/ui/gtk/rtp_stream_dlg.c +++ b/ui/gtk/rtp_stream_dlg.c @@ -41,7 +41,7 @@ #include "../globals.h" #include "../stat_menu.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/rtp_stream_dlg.h" #include "ui/gtk/gui_stat_menu.h" diff --git a/ui/gtk/scsi_stat.c b/ui/gtk/scsi_stat.c index 4e4fe8658a..e8b0caa92c 100644 --- a/ui/gtk/scsi_stat.c +++ b/ui/gtk/scsi_stat.c @@ -46,7 +46,7 @@ #include <epan/dissectors/packet-scsi-smc.h> #include <epan/dissectors/packet-scsi-osd.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../globals.h" #include "../stat_menu.h" diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c index 27e1352294..8c897744b6 100644 --- a/ui/gtk/sctp_assoc_analyse.c +++ b/ui/gtk/sctp_assoc_analyse.c @@ -33,7 +33,7 @@ #include <epan/strutil.h> #include "../globals.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../stat_menu.h" #include "ui/gtk/gui_stat_menu.h" diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c index 6be366fbbb..729ada15f9 100644 --- a/ui/gtk/sctp_byte_graph_dlg.c +++ b/ui/gtk/sctp_byte_graph_dlg.c @@ -35,8 +35,8 @@ #include <epan/strutil.h> #include "../globals.h" -#include "../ui_util.h" -#include "../simple_dialog.h" +#include "ui/ui_util.h" +#include "ui/simple_dialog.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/main.h" diff --git a/ui/gtk/sctp_chunk_stat.c b/ui/gtk/sctp_chunk_stat.c index 6c7d86c7c0..eb93e6a771 100644 --- a/ui/gtk/sctp_chunk_stat.c +++ b/ui/gtk/sctp_chunk_stat.c @@ -42,7 +42,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-sctp.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../file.h" #include "../globals.h" #include "../stat_menu.h" diff --git a/ui/gtk/sctp_error_dlg.c b/ui/gtk/sctp_error_dlg.c index cca516785a..64c459e686 100644 --- a/ui/gtk/sctp_error_dlg.c +++ b/ui/gtk/sctp_error_dlg.c @@ -31,7 +31,7 @@ #include "epan/filesystem.h" #include "../globals.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c index 149fe9ce71..c29a7a06ef 100644 --- a/ui/gtk/sctp_graph_dlg.c +++ b/ui/gtk/sctp_graph_dlg.c @@ -36,8 +36,8 @@ #include <epan/strutil.h> #include "../globals.h" -#include "../ui_util.h" -#include "../simple_dialog.h" +#include "ui/ui_util.h" +#include "ui/simple_dialog.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/main.h" diff --git a/ui/gtk/sctp_stat.c b/ui/gtk/sctp_stat.c index 1f4cf849a1..1680e11f7a 100644 --- a/ui/gtk/sctp_stat.c +++ b/ui/gtk/sctp_stat.c @@ -36,7 +36,7 @@ #include "epan/address.h" #include <epan/strutil.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/sctp_stat.h" diff --git a/ui/gtk/service_response_time_table.c b/ui/gtk/service_response_time_table.c index 61392e9d60..eba87ca521 100644 --- a/ui/gtk/service_response_time_table.c +++ b/ui/gtk/service_response_time_table.c @@ -33,7 +33,7 @@ #include "epan/packet_info.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/service_response_time_table.h" #include "ui/gtk/filter_utils.h" diff --git a/ui/gtk/simple_dialog.c b/ui/gtk/simple_dialog.c index 3504195dc1..c18028f1ad 100644 --- a/ui/gtk/simple_dialog.c +++ b/ui/gtk/simple_dialog.c @@ -31,7 +31,7 @@ #include <epan/strutil.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/gtkglobals.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/sip_stat.c b/ui/gtk/sip_stat.c index f8a68dd641..4b60c79ec4 100644 --- a/ui/gtk/sip_stat.c +++ b/ui/gtk/sip_stat.c @@ -35,7 +35,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-sip.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../globals.h" #include "../stat_menu.h" diff --git a/ui/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c index fa1eb626f7..eed4fc86d7 100644 --- a/ui/gtk/smb2_stat.c +++ b/ui/gtk/smb2_stat.c @@ -40,7 +40,7 @@ #include <epan/dissectors/packet-smb2.h> #include "../timestats.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../file.h" #include "../globals.h" #include "../stat_menu.h" diff --git a/ui/gtk/smb_stat.c b/ui/gtk/smb_stat.c index 8502448308..eeded06c88 100644 --- a/ui/gtk/smb_stat.c +++ b/ui/gtk/smb_stat.c @@ -40,7 +40,7 @@ #include <epan/dissectors/packet-smb.h> #include "../timestats.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../file.h" #include "../globals.h" #include "../stat_menu.h" diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c index 250db6b87f..96158c2e65 100644 --- a/ui/gtk/stats_tree_stat.c +++ b/ui/gtk/stats_tree_stat.c @@ -33,7 +33,7 @@ #include <epan/stats_tree_priv.h> #include <epan/report_err.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../globals.h" #include "../stat_menu.h" diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c index 731d778fee..0b9a66ec50 100644 --- a/ui/gtk/tap_param_dlg.c +++ b/ui/gtk/tap_param_dlg.c @@ -38,7 +38,7 @@ #include <epan/stat_cmd_args.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../file.h" #include "../globals.h" #include "../stat_menu.h" diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c index 4085cb31dc..584ee25344 100644 --- a/ui/gtk/tcp_graph.c +++ b/ui/gtk/tcp_graph.c @@ -52,7 +52,7 @@ #include <epan/tap.h> #include "../globals.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../stat_menu.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/text_page_utils.c b/ui/gtk/text_page_utils.c index 753e7e296d..3242244d37 100644 --- a/ui/gtk/text_page_utils.c +++ b/ui/gtk/text_page_utils.c @@ -35,7 +35,7 @@ #include "epan/filesystem.h" -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include <wsutil/file_util.h> #include "ui/gtk/text_page_utils.h" diff --git a/ui/gtk/time_shift_dlg.c b/ui/gtk/time_shift_dlg.c index 51d8db68f6..e4f36fde70 100644 --- a/ui/gtk/time_shift_dlg.c +++ b/ui/gtk/time_shift_dlg.c @@ -40,9 +40,11 @@ #include <epan/prefs.h> #include "../globals.h" -#include "../alert_box.h" -#include "../simple_dialog.h" -#include "../main_statusbar.h" + +#include "ui/alert_box.h" +#include "ui/simple_dialog.h" +#include "ui/main_statusbar.h" +#include "ui/ui_util.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/time_shift_dlg.h" @@ -51,7 +53,6 @@ #include "ui/gtk/prefs_dlg.h" #include "ui/gtk/keys.h" #include "ui/gtk/help_dlg.h" -#include "ui_util.h" /* Capture callback data keys */ #define E_TIMESHIFT_SELECT "timeshift_select" diff --git a/ui/gtk/voip_calls.c b/ui/gtk/voip_calls.c index cec92c1d91..2cdb382f24 100644 --- a/ui/gtk/voip_calls.c +++ b/ui/gtk/voip_calls.c @@ -62,9 +62,9 @@ #include <epan/dissectors/packet-iax2.h> #include <epan/rtp_pt.h> -#include "../alert_box.h" -#include "../simple_dialog.h" -#include "../ui_util.h" +#include "ui/alert_box.h" +#include "ui/simple_dialog.h" +#include "ui/ui_util.h" #include "ui/gtk/graph_analysis.h" #include "ui/gtk/voip_calls.h" diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c index d037b06d32..d7dbaef78d 100644 --- a/ui/gtk/voip_calls_dlg.c +++ b/ui/gtk/voip_calls_dlg.c @@ -56,6 +56,8 @@ #include "../globals.h" #include "../stat_menu.h" +#include "ui/simple_dialog.h" + #include "ui/gtk/graph_analysis.h" #include "ui/gtk/voip_calls_dlg.h" #include "ui/gtk/voip_calls.h" @@ -65,8 +67,6 @@ #include "ui/gtk/gtkglobals.h" #include "ui/gtk/stock_icons.h" -#include "simple_dialog.h" - #ifdef HAVE_LIBPORTAUDIO #include "ui/gtk/rtp_analysis.h" #include "ui/gtk/rtp_player.h" diff --git a/ui/gtk/webbrowser.c b/ui/gtk/webbrowser.c index 6ffaf61d8a..0ba94be124 100644 --- a/ui/gtk/webbrowser.c +++ b/ui/gtk/webbrowser.c @@ -75,7 +75,7 @@ #include <epan/filesystem.h> #include <epan/prefs.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "ui/gtk/webbrowser.h" diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c index ca61f793e5..eb7aa7f3ec 100644 --- a/ui/gtk/wlan_stat_dlg.c +++ b/ui/gtk/wlan_stat_dlg.c @@ -40,7 +40,7 @@ #include <epan/dissectors/packet-ieee80211.h> #include <epan/strutil.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../stat_menu.h" #include "ui/gtk/gtkglobals.h" diff --git a/ui/gtk/wsp_stat.c b/ui/gtk/wsp_stat.c index edcf1cf841..620441032f 100644 --- a/ui/gtk/wsp_stat.c +++ b/ui/gtk/wsp_stat.c @@ -36,7 +36,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-wsp.h> -#include "../simple_dialog.h" +#include "ui/simple_dialog.h" #include "../globals.h" #include "../stat_menu.h" diff --git a/main_statusbar.h b/ui/main_statusbar.h index 9647a2ed62..9647a2ed62 100644 --- a/main_statusbar.h +++ b/ui/main_statusbar.h diff --git a/progress_dlg.h b/ui/progress_dlg.h index 638c8a3cca..638c8a3cca 100644 --- a/progress_dlg.h +++ b/ui/progress_dlg.h diff --git a/simple_dialog.h b/ui/simple_dialog.h index 7687b4e77b..7687b4e77b 100644 --- a/simple_dialog.h +++ b/ui/simple_dialog.h diff --git a/ui_util.h b/ui/ui_util.h index cd023a32a7..cd023a32a7 100644 --- a/ui_util.h +++ b/ui/ui_util.h |