Move some headers for UI stuff, and the alert_box.c UI-specific file, to

the ui directory.  (Perhaps some other files that would be used by all
flavors of Wireshark, for any GUI toolkit or for someting such as
ncurses, and not for any command-line tool such as TShark, should be
moved there as well.)

Shuffle some #includes to put the "ui/XXX.h" includes together.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40529 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.common b/Makefile.common
index e200daee8e8a059345ef224b895fc70fa31f1999..c74388ccde3de300a9010e16d9486fddfcdd8fca 100644 (file)
--- 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 =       \

diff --git a/capture.c b/capture.c
index 22bab8dd94b53a246ae6843af4b578e1b703c499..eb3b042311f4b5166c0f00f31e90f2ed912986fc 100644 (file)
--- a/capture.c
+++ b/capture.c
@@ -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 cea918a0be092d88d205e0bcf81a5d9338abbdca..02223ef28a80d978cffb1d0b3f9e540d3a7529e5 100644 (file)
--- 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 2a8a0cbdd2682c0a9b2ed3bced981fcb6337d4d6..bd6abfbd686573320aa7b83fe0fa2dd6b0b4a88f 100644 (file)
--- 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))

diff --git a/file.c b/file.c
index 3777aca2fc9ad38bca98054789a88ef143e1858a..68e7336985eb3589f15fb834edf5e048a83b3d93 100644 (file)
--- a/file.c
+++ b/file.c
@@ -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 420e725e702167249c242c9db221a3a223557777..1265c816fcad4899952dc4eb9f23e774e4206afb 100644 (file)
--- 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
similarity index 100%
rename from alert_box.c
rename to ui/alert_box.c

diff --git a/alert_box.h b/ui/alert_box.h
similarity index 100%
rename from alert_box.h
rename to ui/alert_box.h

diff --git a/ui/gtk/afp_stat.c b/ui/gtk/afp_stat.c
index f0da6e1d6eec97659ebf1e37111e961fb337d437..4548b07aa618a934366da9a150f0864f7937b670 100644 (file)
--- 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 0ab3d717fbcff38799662e490bc710e3ada130b6..892374f6101e05b56c2033e1cec2e27db8bfc350 100644 (file)
--- 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 9e2902fb8db7d96669275c9482bb3265d9291a81..a31322f14a791ffafafae9e2fe90ac40e155ef4d 100644 (file)
--- 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 8b1eccd9e8fbd931ab7eef1b37b222e1aee6383f..926b4b749913cff8f931cae92c5040f583c3f238 100644 (file)
--- 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 893707bcbcb182a6bb3a0db501b9199d8268addf..3af4ca7d053eb27c3d3afc9d492ad1e33cdc350e 100644 (file)
--- 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 5b4e9f7c6af51b993ee939626f0919ca7c441ae7..c0e440503ed65c5d03c52866330db7ddbbb3f9ff 100644 (file)
--- 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 66c3dd4d951da1ef582beffe2fa8cccdc2dbfd56..c8081859b774385ce023b15a23c1d88a4347fb7d 100644 (file)
--- 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 6b0546e72844d5027959abb58898232f1cbe9660..5d946e1374d9de936cf72183ec8fbcf49a552a17 100644 (file)
--- 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 9e3b1dd1748f5d48909debad596fc675b74deefd..f34abf48dda2993cc6cd3e825d6ff024d2116e41 100644 (file)
--- 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 4a2a6c1ed7ed6ac578c5cef390d5c712c19ec46a..6b28683979ba5146b8f0dd21409430f99c94ecdc 100644 (file)
--- 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 c941d121a2e41bb55fe1057f67dac5312d89afa3..a8b3562f26c4d049ab9fcbae14e1c07ea8604687 100644 (file)
--- 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 40a3d34d1b344ac4a7135e63faa783e76db8599f..a6990954de9c61f71665241424c2c441ec5a1931 100644 (file)
--- 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 0f3ee92558f9986292af6c2adc2388ca8e6e5ba8..67cb3dc46d221c1ed52f73c11e4c05228860e581 100644 (file)
--- 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 77cb2fa23eb62c011fd34726df2afa7cfc2334db..c1fca7f77a04a7afcac6c1457b55ec649331cb92 100644 (file)
--- 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 7e2d9243ed2b43f0654652b5c0761c650c7dd22b..9013e9a0d4baba51d8d91b6179a95bc0a558a691 100644 (file)
--- 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 ea487c49643a2254c4940fc41a2ce5188943cdf7..904a14f97e4635a2212ac9ce42d9acaf40012fc3 100644 (file)
--- 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 5573b8162a567be56bfc5530fbe19f0dfe155e68..46fbf340d47e775c4a15b8888a0fdafec44329bd 100644 (file)
--- 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 e44b5bc20b103319f67b4ad058efceafb6c83e75..73b2643e7f7dfd9333f1dcfb497443b3ff722405 100644 (file)
--- 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 13d8131ccf9972f185e4bd7cce7f00d631a242d6..a50d3c45c0855f654c7e6532f585dac648263f2e 100644 (file)
--- 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 202e73a8a7b0ff507069d2f1d4c6b77cdf34e053..5b087161817ecafc20de67552535888c9027b53d 100644 (file)
--- 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 8f954eeb3d54d5c7241d6e8bf5e8177d9f9eb78a..c50f7ee3d82afbc0dd7dbb126fabfc4446cd3f84 100644 (file)
--- 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 da690b5a01ce56f9671a2a681d14939c56fc09ef..d57ef5aaaf7dc880dc5d583c2b433896b758dba9 100644 (file)
--- 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 3c6733f588cd9c4b8afbce02583b31c3230caff0..2d95745168e5cac086643c29df0f0753273da56d 100644 (file)
--- 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 43e2fb664cc0cbc1af2967669ca395bd002d0696..6c8cf92172d96b0beab1042fe7bc1b64acefe760 100644 (file)
--- 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 85fb78bcc42541a17908bbdb4718f505533be6e2..5f8c54082f5a65ee3107bdda0ce8c265d7395df5 100644 (file)
--- 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 153ff83b6c248c14742a3d77d823043824b84c74..ec96b437e96d6498af734dc64c9005061757a663 100644 (file)
--- 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 7d34fbbcf50cc6d734d9481c1c27d198a8bc2ff5..f320ca091d78b9a893ef3461220380b2bbec1162 100644 (file)
--- 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 f31b6f6d6329afe0ddf8f71e3b420e2ba739a2c9..974013ed28ab06f83f35e122a3f893590f1e2514 100644 (file)
--- 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 362b0e41cf29d0a74b7dc9c6cd84d91cbbd1ad8e..05453b57aea3f1aa2a36a5394d3a959bf8bb25e6 100644 (file)
--- 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 b5a77358a608cb1215260e7d3c255a2ca6f377a2..5e1f7013f9a600cbf154506f1effe5a0eef36bea 100644 (file)
--- 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 1684190587ddea6516a4900d153ef7c4bd49923e..50ca8b841b04ca6682f0ad7c7086dbd6deb35d60 100644 (file)
--- 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 1349826b069c5e7b43721f5da7187da83ab58e1b..ddbb82812d4064bc5a5a812a798e655938fad9c6 100644 (file)
--- 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 aa9e693e63193188b7c23f3ea62c791d42b7f738..0332bb705ea631505b768c1ef0f4c6fe03df5c4b 100644 (file)
--- 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 c690f16dab4ecc3d23af2d38d57c00804a0d2dac..7ff98efdd970689128e39ead0718eea16cd7b4d6 100644 (file)
--- 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 72ffcfa40557b3afc17a23d810522d24f7f97cb6..431a8f0aac2b5c6f40276bfe8abfe31b2e07addf 100644 (file)
--- 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 f8b62adeae415cbe36d4c45ec58253e4b5d28863..8f34b0c25958c2e57ae64d21e2b701649630ea17 100644 (file)
--- 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 cee99305db935a6a43e2665769792d719b0f61d1..dfc3a490846180d57d0686e50807c715f6788c3c 100644 (file)
--- 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 6e08ae280c3658f80454d40245a6333cdb4ea587..6f01ec3f25cf1f2139054638aa438319cd727ed2 100644 (file)
--- 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 ada4f65b55dd9ec47cc3ac60ad78fc492f4df875..5738d1e65e3481e59c3f03fe5b3bfdb10dc7e0fb 100644 (file)
--- 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 a25f569d1de94bccb336b9d80e92f2b10deb3a73..6b26321f46b6fb04d48efe9e14c6fe5d18b5fdeb 100644 (file)
--- 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 693087ed4454459659fc04ccc75ae1c1de6aa981..4af1a8877bbed9b19e646b8503c5046125692c8a 100644 (file)
--- 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 afc1bb9871510fbdeaef6567f334f369c9e6d5e9..7d089f575e2dd8e45f6d7bd22a2e0b5e5e4aa33a 100644 (file)
--- 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 a014c0289523842d7bc9ef13826918db4b53a7ff..567f535f7c277c0eac0a1404e2baa592c63531c2 100644 (file)
--- 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 158430d22f3279d58ea3a113a3841ccb5d5731d1..9d749f16bffec6c636735af34c2a26b6018b4816 100644 (file)
--- 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 5f39e516d7694f8d743a97f2b231efd539844b84..e9e503711b95d39266a34212a5735b1bb736dcde 100644 (file)
--- 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 4da736065b93dcb2384babea83bf9f3996e25f5e..5f272fab140c64cd8c6a9fc754ec680208fb85f6 100644 (file)
--- 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 ba095c760dcbff929e27030a02107ca1d5e7d8ac..7eb6b1d37c411d100290b890e32370946703f082 100644 (file)
--- 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 8ae18b69eb4b8693c3d6f877e7ff275d28650285..db94cbf79d7120622ad18233912c9de120aa1e05 100644 (file)
--- 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 f21c95b42b1fc5d734acef7ba560427016d293bc..5a35348fa9bdfd685f21905ba67d99105de10999 100644 (file)
--- 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 bd988947defda72df435188a74f810974f9d3f9d..019db0fe6aac9984872a24b303c5c633e3293272 100644 (file)
--- 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 2f2974ee6e47c80a33396fa56e0f051e9cfad983..202b3101dc7148a4d4d19c2423c3ecd838a02e1d 100644 (file)
--- 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 43f647412b6c9bdb9d32e5232dde86a2125a0f50..9a8fc011a61aacb2efcab6b138f692f914ce9dfa 100644 (file)
--- 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 923262777e2627c959d20c145a18f79e695430b9..ae691e9438cce34837705abdd1c7ef53f8188e4a 100644 (file)
--- 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 cbd48671ced1908b6354796e32c51330538d0bf6..814f4673f8ed360ef990880cb27b8093d44a2a9c 100644 (file)
--- 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 a19e1f75d62ef02cdfa50e8adaddf100c3017d11..c42860af5798d91484432e36e90e848247c4d426 100644 (file)
--- 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 ce24391b22ecfe1e4ed520f945f42fb1377364e8..a31f70a647c5bf75eaef031696076941a911e63f 100644 (file)
--- 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 0989132eac638b239458de5928e181aae47c88ac..5326f4a6c404e4dfb314ae1feba64dd5a0bada33 100644 (file)
--- 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 0362df3e98ec74c168979df3387bcc5939998c96..f79d94a4edb739df35ece85d044c8b585ccce3c8 100644 (file)
--- 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 e10072f9665d6f952d5c2b64c536cefc418a7f62..8a702ad0fb9828381e448b724da2ac4b0c15a036 100644 (file)
--- 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 d431b941acc8ecfc5c4fb6e6f9e610873ba09fc5..daa50f4952101a6a3263db947d5cf0b898933886 100644 (file)
--- 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 a52abfd69dd5963c9021e09d64574e14529b727e..4937c3a69e71ea9bb107fa9725a1e8f335f04f74 100644 (file)
--- 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 b80c663d7da5b0d98cbb55d47048835c3db4e78d..3b7f0aff991610f8f4b4a83e6cd9c7ee9b52f3b0 100644 (file)
--- 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 9ac030fe3bac526f1c288adfea661be897ae500c..6003ad0c92adf39f1857ffbe61579184104fbb26 100644 (file)
--- 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 8a562e79599b71047643a82a410ca80422428aec..61b67b19bc5d61559760d350b323d15adaec8edc 100644 (file)
--- 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 b746cdf1eecfb7562c8450bb81c9a8a4ea647b31..d242e81c8fdb8874cd6cd31d39ba2c4e23a71205 100644 (file)
--- 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 b05159b7d1ed551096df00913ea174f78e9d1806..9f55c4c38164f7e0af9ba0735808a43aeb2597aa 100644 (file)
--- 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 aa1834af06537960e4bfa2832b7a6acf05c7a795..e8b370618d8fd940274a99d106599f7e6c53c8ff 100644 (file)
--- 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 ddd1a8aa2ec00f3b4df541133accaa0b79746793..9b0d4d298dc1c9449811e0be5e668a868eb48ea2 100644 (file)
--- 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 c83d3d0d9c9390b75f0a6da6075b1c0297862277..e20a579d87d141c05c178ebdc0d63109fa1a19bd 100644 (file)
--- 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 d8df054b10a9fc7e507e09ff40210df748473f89..3cea65cb543ddc85b94dd8e4d50d575e173f6a53 100644 (file)
--- 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 989a3ff7e1e2a49d09d0e8dd1174a9569788b726..9f3e5f6cd0ec17b287912e80ae31e2a21262d91f 100644 (file)
--- 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 44e504e3393cf171635efa792c3ee651e0a46008..f07f9e0d238caac613bd066064a32ad1e6f27741 100644 (file)
--- 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 49d17df03350cfb25fe8086053a549187510d96e..b4c0aca5b767ffd06db66e8fdb9ec7fe35ea275d 100644 (file)
--- 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 a5a5bbd44db00badf741d21343de8f46f4c38b62..07e8dbfa447bfd88253cea3de09496a49eebdca2 100644 (file)
--- 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 e519456b57139197c6ee848edf8b1cb01cc28879..41205f3e93f78117391323bb9aeb32fbcf56e089 100644 (file)
--- 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 fd3ab2fc5d811556efb7aaf720b5e48dd91e90d2..c35dd1d09b4789794e47fa2bbae4414992860eb0 100644 (file)
--- 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 c8427740e759465926e2baf883bb06365e0ab121..7ed23200860f28556cbc92d33049bcc78466accb 100644 (file)
--- 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 63f7c30a39b32827464976f94265b1eae303c6a4..fe5810671630f1d494f66bf369f267c401b7e46c 100644 (file)
--- 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 362caa94f0a83ec8ca2672f63f7475240191cee2..7575a43941ab0fa15cfe0c75d176b868d0f15aa6 100644 (file)
--- 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 1d007eaf24924fd6752109191e83401faccbf5dd..ac07c0403ec4da6879970dcd34b12a3add24b471 100644 (file)
--- 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 4e67e4bdef8db71c2c9dae7f1b2630fd4dbc0d5a..ced69ad8d08c886b338f662e4592d51f41e50b11 100644 (file)
--- 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 21e95790e793839caa46c361bec00f8616a4e26a..34c8dfe71bd24e04286d5c7393626cbcffb2920a 100644 (file)
--- 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 0c07503b4bd2f7337e27e7d2b590ff83463013e5..73f0aae8f37e4b85245fbf2f146158b334b0a7ec 100644 (file)
--- 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 f32e6061aca614f6718c5ab0975fce75dc8e7f2a..ded2a9e86a4066def5ea4076d5f9dc0771dafacf 100644 (file)
--- 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 0a891df25ddfe071706395dba7101a219b581278..c1b62a72f6835df36f1598b6761e8c95238b7d66 100644 (file)
--- 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 fb8b8058c6b36d055148ac2c604f2a6fe9e942cd..0a822be52564e0682e97dbfe06f6186fafeb6048 100644 (file)
--- 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 b4b6ddfc9c4fdebc738841255bffcc3e5b266f35..9d5ae802488b7b7bfbe85031a346b13997836e6c 100644 (file)
--- 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 1d647056abac5a858052d00fc453f4c2697c09a9..f64c069ec21685ff8c76fbcdeeecfbb33455eab0 100644 (file)
--- 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 e0f3f76da49d7a80969b17b4753b46dea97afff4..e7cdad7573e062081c7e2d695b76fa6245b0c546 100644 (file)
--- 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 2d96a10d931569958f40f124e46661b59364003c..5498e0d68dc8bb021ab31f5c7fe07b751621cefd 100644 (file)
--- 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 977e616ae0221833a5ec20374c3115d2e18a3289..23217b89a39c0df3b0cd0045221a8480333f9de8 100644 (file)
--- 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 4e4fe8658a7725f3300818046e37446986d46225..e8b0caa92c0fa52220e11ae5a3760a5f1a3c9e96 100644 (file)
--- 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 27e13522940d2585272f665ae1564156b5762590..8c897744b6c71b8531da0b1f257e44592830fc83 100644 (file)
--- 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 6be366fbbb5626c95807d3406a22d69f6988992c..729ada15f9f2c336a89b10792df0b809ebb376a6 100644 (file)
--- 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 6c7d86c7c0fc5c9f1f5a51182c3d1b26fe16cd43..eb93e6a771332066d0ea9bb25ba669e391573318 100644 (file)
--- 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 cca516785afac1c31d82b3453870f3614ed1c3f5..64c459e686cdfd3cfe288a885f8745a7cd94410d 100644 (file)
--- 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 149fe9ce7122b950fc417fd44ca503ef229b938c..c29a7a06ef14138ca6426d55bb68879c57933ba7 100644 (file)
--- 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 1f4cf849a111722ca25f20c141b25a39ea4370a9..1680e11f7a12f848aaefc65facf66c9d3786695a 100644 (file)
--- 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 61392e9d606c24c44145d16dd288c8578a20d7aa..eba87ca521b1cf4ac3995d5a54063bed50a3325e 100644 (file)
--- 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 3504195dc12d0a17aa35657bcaf8b4334490e21c..c18028f1ad7682a08748a6c32859115a8d1e02d9 100644 (file)
--- 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 f8a68dd641b9aa2c84b9806c2751fcbcda543e4b..4b60c79ec498b023c494af68db679172f31aa124 100644 (file)
--- 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 fa1eb626f7740455a073be1453dc1cfdc11c4652..eed4fc86d7b2766a78bd7ba5e940f1a75c179fd0 100644 (file)
--- 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 8502448308c2688a3534ccfe0eb2c148dd9416e2..eeded06c88cc1a36d27c27035278ccf5a7ecf58a 100644 (file)
--- 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 250db6b87ff99be484fcf535ee429d8cb89a1715..96158c2e65c61b9ee95fd48a0f9db427adf2a4f4 100644 (file)
--- 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 731d778fee573851ff2c279def89a77131faaec5..0b9a66ec509080bab2ce745028d3ae5cc2e32718 100644 (file)
--- 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 4085cb31dcdb6a11d17cb86e1d1b15fa7ffb01fe..584ee25344800e2f6e31cf948ff089fed56dc774 100644 (file)
--- 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 753e7e296d610cbd4ae25d1a6e7bc5a2ac00948e..3242244d37ced90c369cd4cbf42a02e2b00603fb 100644 (file)
--- 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 51d8db68f62f0079086bcbad90d5c7f733c5bb80..e4f36fde7098a879f691e57b6b68f683ac81e0fc 100644 (file)
--- 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 cec92c1d9146499d5984d6ebecc8481a735f3a3a..2cdb382f2414c2444108ef906f3dc7d4ef1e0e90 100644 (file)
--- 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 d037b06d32c5c067ff864efd230d8c1866d31a55..d7dbaef78d1662aa0136f486b1f3d319a78aac1c 100644 (file)
--- 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 6ffaf61d8a7d2df5612dfa3c2e3e24121de09fbf..0ba94be124d1722e51cb1b3d1b8e1df522371829 100644 (file)
--- 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 ca61f793e58d8d7fb0311b683f36d2d76f3a2b58..eb7aa7f3ec4f4103d050d5271a01397c7d3a5c5a 100644 (file)
--- 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 edcf1cf84109c472e597157094615b5af49d70b6..620441032fce9403b8cd80080312e1b94d259068 100644 (file)
--- 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
similarity index 100%
rename from main_statusbar.h
rename to ui/main_statusbar.h

diff --git a/progress_dlg.h b/ui/progress_dlg.h
similarity index 100%
rename from progress_dlg.h
rename to ui/progress_dlg.h

diff --git a/simple_dialog.h b/ui/simple_dialog.h
similarity index 100%
rename from simple_dialog.h
rename to ui/simple_dialog.h

diff --git a/ui_util.h b/ui/ui_util.h
similarity index 100%
rename from ui_util.h
rename to ui/ui_util.h